From bd6313372ea38c1960a0aa4f3f92caa8764cab8d Mon Sep 17 00:00:00 2001
From: Corey Johnson & Kevin Sawicki <cj+kevin@github.com>
Date: Tue, 9 Oct 2012 10:42:38 -0700
Subject: [PATCH] Remove TextMate bundles from Atom source

Bundles are now cloned into ~/.atom/bundles using `rake
clone-default-bundles`
---
 Rakefile                                      |   37 +-
 .../CoffeeScriptBundle.tmbundle/.gitignore    |    1 -
 .../Commands/Align Assignments.tmCommand      |  159 -
 .../Commands/CoffeeScript.sublime-build       |    6 -
 .../Commands/Compile and Display JS.tmCommand |   33 -
 .../Commands/Insert Heredoc comment.tmCommand |   34 -
 ...ert Heredoc triple double quotes.tmCommand |   34 -
 ...ert Heredoc triple single quotes.tmCommand |   34 -
 .../Commands/New Function.tmCommand           |   27 -
 .../Commands/Run selected text.tmCommand      |   25 -
 .../Commands/Run.tmCommand                    |   32 -
 .../Preferences/CoffeeScript.tmPreferences    |   36 -
 .../Disable Indent Corrections.tmPreferences  |   17 -
 .../Preferences/Indent.tmPreferences          |   27 -
 .../Symbol List Method 2.tmPreferences        |   19 -
 .../Symbol List Method.tmPreferences          |   17 -
 .../README.markdown                           |   21 -
 .../Snippets/Array comprehension.tmSnippet    |   17 -
 .../Snippets/Bound Function.tmSnippet         |   17 -
 .../Snippets/Class.tmSnippet                  |   20 -
 .../Snippets/Else if.tmSnippet                |   17 -
 .../Snippets/Function.tmSnippet               |   19 -
 .../Snippets/If __ Else.tmSnippet             |   19 -
 .../Snippets/If.tmSnippet                     |   17 -
 .../Snippets/Interpolated Code.tmSnippet      |   18 -
 .../Snippets/Object comprehension.tmSnippet   |   17 -
 .../Range comprehension (exclusive).tmSnippet |   17 -
 .../Range comprehension (inclusive).tmSnippet |   17 -
 .../Snippets/Raw javascript.tmSnippet         |   16 -
 .../Snippets/Switch.tmSnippet                 |   18 -
 .../Snippets/Ternary If.tmSnippet             |   16 -
 .../Snippets/Try __ Catch.tmSnippet           |   19 -
 .../Snippets/Unless.tmSnippet                 |   16 -
 .../Snippets/h1.tmSnippet                     |   16 -
 .../Snippets/h2.tmSnippet                     |   16 -
 .../Snippets/h3.tmSnippet                     |   16 -
 .../Snippets/log.tmSnippet                    |   16 -
 .../Snippets/require.tmSnippet                |   16 -
 .../Syntaxes/CoffeeScript.tmLanguage          |  736 ---
 .../CoffeeScriptBundle.tmbundle/info.plist    |  114 -
 bundles/Readme.md                             |    1 +
 .../Commands/CodeCompletion CSS 2.tmCommand   |   40 -
 ...deCompletion CSS Property Values.tmCommand |   40 -
 .../Commands/CodeCompletion CSS.tmCommand     |   29 -
 .../Commands/Documentation for Property.plist |  182 -
 .../css.tmbundle/Commands/Insert Color.plist  |  204 -
 bundles/css.tmbundle/Commands/Preview.plist   |  277 --
 .../Commands/Validate Selected CSS.plist      |   44 -
 .../Insert Image URL.tmDragCommand            |   42 -
 .../Macros/Format CSS Compressed.tmMacro      |  190 -
 .../css.tmbundle/Macros/Format CSS.tmMacro    |  100 -
 .../Preferences/Comments.tmPreferences        |   36 -
 .../Preferences/Completions.tmPreferences     |  102 -
 .../Preferences/Folding.tmPreferences         |   19 -
 .../Preferences/Miscellaneous.tmPreferences   |   46 -
 .../Property Completions.tmPreferences        |  151 -
 .../Property Value Completions.tmPreferences  |  144 -
 .../Preferences/PropertyName.tmPreferences    |   22 -
 .../Symbol List: Group.tmPreferences          |   19 -
 .../Preferences/Symbol list.tmPreferences     |   19 -
 bundles/css.tmbundle/README.mdown             |   20 -
 .../Snippets/!important CSS (!).plist         |   18 -
 ...ed Position Bottom 100% wide IE6.tmSnippet |   18 -
 ...ttachment: scroll:fixed (background).plist |   16 -
 ...round-color:  color-hex (background).plist |   16 -
 ...ound-color:  color-name (background).plist |   16 -
 ...round-color:  color-rgb (background).plist |   16 -
 ...und-color:  transparent (background).plist |   16 -
 ...background-image:  none (background).plist |   16 -
 .../background-image:  url (background).plist |   16 -
 ...und-position:  position (background).plist |   16 -
 ...-repeat:  r:r-x:r-y:n-r (background).plist |   16 -
 ...eat attachment position (background).plist |   16 -
 ...tom-color: size style color (border).plist |   16 -
 ...tom-style: size style color (border).plist |   16 -
 ...tom-width: size style color (border).plist |   16 -
 ...er-bottom: size style color (border).plist |   16 -
 .../border-color: color (border).plist        |   16 -
 .../border-left-color: color (border).plist   |   16 -
 .../border-left-style: style (border).plist   |   16 -
 .../border-left-width: size (border).plist    |   16 -
 ...rder-left: size style color (border).plist |   16 -
 .../border-right-color: color (border).plist  |   16 -
 .../border-right-style: style (border).plist  |   16 -
 .../border-right-width: size (border).plist   |   16 -
 ...der-right: size style color (border).plist |   16 -
 .../border-style: style (border).plist        |   16 -
 .../border-top-color: color (border).plist    |   16 -
 .../border-top-style: style (border).plist    |   16 -
 .../border-top-width: size (border).plist     |   16 -
 ...order-top: size style color (border).plist |   16 -
 .../border-width: width (border).plist        |   16 -
 .../border:   size style color (border).plist |   16 -
 .../Snippets/clear: value (clear).plist       |   16 -
 .../Snippets/color:  color-hex (color).plist  |   16 -
 .../Snippets/color:  color-name (color).plist |   16 -
 .../Snippets/color:  color-rgb (color).plist  |   16 -
 .../Snippets/cursor: type (cursor).plist      |   16 -
 .../Snippets/cursor: url (cursor).plist       |   16 -
 .../direction: ltr|rtl (direction).plist      |   16 -
 .../Snippets/display: block (display).plist   |   16 -
 .../display: common-types (display).plist     |   16 -
 .../Snippets/display: inline (display).plist  |   16 -
 .../display: table-types (display).plist      |   16 -
 ...ageLoader [for IE PNGs] (background).plist |   19 -
 .../float: left:right:none (float).plist      |   16 -
 .../font-family:   family (font).plist        |   16 -
 .../Snippets/font-size: size (font).plist     |   16 -
 ...tyle:   normal:italic:oblique (font).plist |   16 -
 ...-variant:   normal:small-caps (font).plist |   16 -
 .../Snippets/font-weight: weight (font).plist |   16 -
 ...size:line-height font -family (font).plist |   16 -
 .../Snippets/font: size font (font).plist     |   16 -
 ...letter-spacing:   length-em (letter).plist |   16 -
 ...letter-spacing:   length-px (letter).plist |   16 -
 .../list-style-image: url (list).plist        |   16 -
 .../list-style-position: pos (list).plist     |   16 -
 .../list-style-type: asian (list).plist       |   16 -
 .../list-style-type: marker(list).plist       |   16 -
 .../list-style-type: numeric (list).plist     |   16 -
 .../list-style-type: other (list).plist       |   16 -
 ...style-type: roman-alpha-greek (list).plist |   16 -
 ...st-style: type position image (list).plist |   16 -
 .../margin-bottom: length (margin).plist      |   16 -
 .../margin-left: length (margin).plist        |   16 -
 .../margin-right: length (margin).plist       |   16 -
 .../margin-top: length (margin).plist         |   16 -
 .../Snippets/margin:   all (margin).plist     |   16 -
 .../Snippets/margin: T R B L (margin).plist   |   16 -
 .../Snippets/margin: V H (margin).plist       |   16 -
 .../marker-offset: auto (marker).plist        |   16 -
 .../marker-offset: length (marker).plist      |   16 -
 ...y: [for Safari, FF and IE] (opacity).plist |   18 -
 .../Snippets/overflow: type (overflow).plist  |   16 -
 .../padding-bottom: length (margin).plist     |   16 -
 .../padding-left: length (margin).plist       |   16 -
 .../padding-right: length (margin).plist      |   16 -
 .../padding-top: length (margin).plist        |   16 -
 .../padding:   T R B L (padding).plist        |   16 -
 .../Snippets/padding:   V H (padding).plist   |   16 -
 .../Snippets/padding:   all (padding).plist   |   16 -
 .../Snippets/position: type (position).plist  |   16 -
 .../Snippets/properties { } ( } ).plist       |   19 -
 .../css.tmbundle/Snippets/scrollbar.tmSnippet |   23 -
 .../css.tmbundle/Snippets/selection.tmSnippet |   20 -
 .../text-align: left:center:right (txt).plist |   16 -
 ...e:overline:line-through:blink (text).plist |   16 -
 .../Snippets/text-indent: length (text).plist |   16 -
 ...xt-shadow: color-hex x y blur (text).plist |   16 -
 ...xt-shadow: color-rgb x y blur (text).plist |   16 -
 .../Snippets/text-shadow: none (text).plist   |   16 -
 ...sform: capitalize:upper:lower (text).plist |   16 -
 .../text-transform: none (text).plist         |   16 -
 .../vertical-align: type (vertical).plist     |   16 -
 .../visibility: type (visibility).plist       |   16 -
 ...te-space:  normal:pre:nowrap (white).plist |   16 -
 .../word-spacing:  length (word).plist        |   16 -
 .../word-spacing:  normal (word).plist        |   16 -
 .../Snippets/z-index: index (z).plist         |   16 -
 bundles/css.tmbundle/Syntaxes/CSS.plist       | 1004 ----
 bundles/css.tmbundle/Tests/tests.css          |  255 -
 bundles/css.tmbundle/info.plist               |  391 --
 .../About Persistent Includes.tmCommand       |  145 -
 .../CodeCompletion HTML Attributes.tmCommand  |   28 -
 .../CodeCompletion HTML Tags.tmCommand        |   29 -
 ...vert Line : Selection to URL Escapes.plist |   29 -
 .../Commands/Convert to HTML Entities.plist   |   40 -
 .../Convert to named entities excl tags.plist |   53 -
 .../Commands/Decode HTML Entities.plist       |   41 -
 ...eric URL Escapes in Line : Selection.plist |   27 -
 .../Commands/Documentation for Tag.plist      |  153 -
 ...ncrypt Line : Selection (ROT 13).tmCommand |   37 -
 .../Commands/Insert Close Tag.plist           |   60 -
 .../Commands/Insert Entity….plist             |   48 -
 .../Commands/Insert Tag Pair.plist            |   61 -
 .../Commands/Persistent Include.tmCommand     |   25 -
 .../Preview in All Active Browsers.plist      |   64 -
 .../Refresh All Active Browsers.plist         |   55 -
 .../Commands/Show Web Preview.tmCommand       |   25 -
 .../Commands/Strip HTML tags.plist            |   29 -
 bundles/html.tmbundle/Commands/Tidy.plist     |   84 -
 .../Commands/Update Includes.tmCommand        |   25 -
 .../Commands/Update Project.tmCommand         |   25 -
 .../Commands/W3C validation.plist             |   41 -
 ...Each Selected Line in Open:Close Tag.plist |   24 -
 .../DragCommands/Anchor Tag.plist             |   33 -
 .../html.tmbundle/DragCommands/CSS Link.plist |   20 -
 .../DragCommands/Image Tag.plist              |   52 -
 .../Insert Anchor href 2.tmDragCommand        |   33 -
 .../Insert Anchor href.tmDragCommand          |   33 -
 .../Insert Flash Movie (Swf).tmDragCommand    |  143 -
 .../DragCommands/Insert JS Link.tmDragCommand |   22 -
 .../Insert QuickTime Movie.tmDragCommand      |   48 -
 .../DragCommands/Insert URL.tmDragCommand     |   33 -
 .../Delete whitespace between tags.plist      |   42 -
 .../html.tmbundle/Preferences/Comments.plist  |   30 -
 .../Completions HTML Attributes.tmPreferences |  346 --
 .../Preferences/Empty tag typing pairs.plist  |   26 -
 .../Preferences/Folding.tmPreferences         |   35 -
 .../Indent Corrections.tmPreferences          |   19 -
 .../Preferences/Miscellaneous.plist           |   93 -
 .../Preferences/Symbol List: ID.plist         |   17 -
 .../Preferences/Tag Completions.tmPreferences |   30 -
 .../Preferences/Tag preferences.plist         |   48 -
 bundles/html.tmbundle/README.mdown            |   20 -
 .../Snippets/Arrow (arrow).plist              |   16 -
 .../Snippets/Backspace (backspace).plist      |   16 -
 .../Snippets/Backtab (backtab).plist          |   16 -
 .../Snippets/Command (command).plist          |   16 -
 .../Snippets/Control (control).plist          |   16 -
 .../Snippets/Delete (delete).plist            |   16 -
 .../Snippets/DocType HTML 4.0 Strict.plist    |   18 -
 .../Snippets/DocType HTML 5.plist             |   17 -
 .../Snippets/DocType XHTL 1.0 Frameset.plist  |   18 -
 .../Snippets/DocType XHTML 1.0 Strict.plist   |   18 -
 .../DocType XHTML 1.0 Transitional.plist      |   18 -
 .../Snippets/DocType XHTML 1.1.plist          |   18 -
 .../html.tmbundle/Snippets/Down (down).plist  |   16 -
 .../Snippets/Embed QT movie (movie).plist     |   26 -
 .../Snippets/Emphasize.tmSnippet              |   16 -
 .../Snippets/Enter (enter).plist              |   16 -
 .../Snippets/Escape (escape).plist            |   16 -
 .../html.tmbundle/Snippets/Fieldset.tmSnippet |   22 -
 .../HTML — 4.0 Transitional (doctype).plist   |   18 -
 ...ment: Internet Explorer 5_0 only.tmSnippet |   16 -
 ...ment: Internet Explorer 5_5 only.tmSnippet |   16 -
 ...l Comment: Internet Explorer 5_x.tmSnippet |   16 -
 ...t: Internet Explorer 6 and below.tmSnippet |   16 -
 ...omment: Internet Explorer 6 only.tmSnippet |   16 -
 ...al Comment: Internet Explorer 7+.tmSnippet |   16 -
 ...ional Comment: Internet Explorer.tmSnippet |   16 -
 ...l Comment: NOT Internet Explorer.tmSnippet |   16 -
 .../Snippets/Input with Label.tmSnippet       |   19 -
 .../html.tmbundle/Snippets/Left (left).plist  |   16 -
 .../Snippets/Option (option).plist            |   16 -
 .../html.tmbundle/Snippets/Option.tmSnippet   |   18 -
 .../Snippets/Return (return).plist            |   16 -
 .../Snippets/Right (right).plist              |   16 -
 .../Snippets/Select Box.tmSnippet             |   22 -
 .../Snippets/Shift (shift).plist              |   16 -
 .../Smart return:indent for tag pairs.plist   |   18 -
 .../html.tmbundle/Snippets/Strong.tmSnippet   |   16 -
 .../html.tmbundle/Snippets/Tab (tab).plist    |   16 -
 bundles/html.tmbundle/Snippets/Up (up).plist  |   16 -
 .../Snippets/Wrap Selection In Tag.plist      |   16 -
 .../Snippets/Wrap in <?= … ?>.plist           |   14 -
 .../Snippets/XHTML   <input>.plist            |   16 -
 .../Snippets/XHTML   <textarea>.plist         |   16 -
 .../XHTML &nbsp; NonBreakingSpace.plist       |   16 -
 .../Snippets/XHTML <a mailto: >.plist         |   16 -
 .../html.tmbundle/Snippets/XHTML <base>.plist |   16 -
 .../html.tmbundle/Snippets/XHTML <body>.plist |   18 -
 .../html.tmbundle/Snippets/XHTML <br :>.plist |   16 -
 .../html.tmbundle/Snippets/XHTML <div>.plist  |   18 -
 .../html.tmbundle/Snippets/XHTML <form>.plist |   20 -
 .../html.tmbundle/Snippets/XHTML <h1>.plist   |   16 -
 .../html.tmbundle/Snippets/XHTML <head>.plist |   20 -
 .../html.tmbundle/Snippets/XHTML <link>.plist |   16 -
 .../html.tmbundle/Snippets/XHTML <meta>.plist |   16 -
 .../Snippets/XHTML <script src...>.plist      |   16 -
 .../Snippets/XHTML <script>.plist             |   18 -
 .../Snippets/XHTML <style>.plist              |   18 -
 .../Snippets/XHTML <table>.plist              |   19 -
 .../Snippets/XHTML <title>.plist              |   16 -
 bundles/html.tmbundle/Support/entities.txt    |  252 -
 .../nibs/Insert Entity.nib/classes.nib        |    7 -
 .../Support/nibs/Insert Entity.nib/info.nib   |   16 -
 .../nibs/Insert Entity.nib/keyedobjects.nib   |  Bin 11362 -> 0 bytes
 bundles/html.tmbundle/Support/tminclude.rb    |  371 --
 bundles/html.tmbundle/Syntaxes/HTML.plist     |  841 ----
 .../Templates/HTML – 4.0 Strict/index.html    |   15 -
 .../Templates/HTML – 4.0 Strict/info.plist    |   20 -
 .../HTML — 4.0 Transitional/index.html        |   15 -
 .../HTML — 4.0 Transitional/info.plist        |   20 -
 .../Templates/XHTML – 1.0 Frameset/index.html |   16 -
 .../Templates/XHTML – 1.0 Frameset/info.plist |   16 -
 .../Templates/XHTML – 1.0 Strict/index.html   |   16 -
 .../Templates/XHTML – 1.0 Strict/info.plist   |   16 -
 .../XHTML – 1.0 Transitional/index.html       |   16 -
 .../XHTML – 1.0 Transitional/info.plist       |   16 -
 .../Templates/XHTML – 1.1/index.html          |   15 -
 .../Templates/XHTML – 1.1/info.plist          |   16 -
 bundles/html.tmbundle/info.plist              |  299 --
 ...Copy as Bookmarklet to Clipboard.tmCommand |   54 -
 .../Commands/Documentation for Word.plist     |   30 -
 .../Commands/New Function.tmCommand           |   28 -
 .../Commands/New Method.tmCommand             |   28 -
 .../Reformat Document : Selection.tmCommand   |   40 -
 .../Preferences/Comments.tmPreferences        |   36 -
 .../JavaScript Indent.tmPreferences           |   19 -
 .../Symbol List Banned.tmPreferences          |   17 -
 .../Symbol List Class.tmPreferences           |   21 -
 .../Symbol List Instance.tmPreferences        |   21 -
 .../Symbol List Sub 1.tmPreferences           |   21 -
 .../Symbol List Sub 2.tmPreferences           |   21 -
 .../Snippets/Get Elements.tmSnippet           |   16 -
 .../Snippets/Object Method String.tmSnippet   |   18 -
 .../Snippets/Object Method.tmSnippet          |   18 -
 .../Snippets/Object Value JS.tmSnippet        |   16 -
 .../Object key — key: \"value\".tmSnippet"    |   18 -
 .../Snippets/Prototype (proto).plist          |   19 -
 .../Snippets/for (…) {…} (faster).tmSnippet   |   18 -
 .../Snippets/for (…) {…}.tmSnippet            |   18 -
 .../Snippets/function (fun).plist             |   18 -
 .../Snippets/function.tmSnippet               |   16 -
 .../Snippets/if ___ else.tmSnippet            |   16 -
 .../javascript.tmbundle/Snippets/if.tmSnippet |   16 -
 .../Snippets/setTimeout function.tmSnippet    |   16 -
 .../Support/dev_guru_index.gz                 |  Bin 1987 -> 0 bytes
 .../Support/lib/jsbeautifier-license.txt      |   22 -
 .../Support/lib/jsbeautifier.py               | 1080 -----
 .../Syntaxes/JavaScript.plist                 |  712 ---
 bundles/javascript.tmbundle/info.plist        |  136 -
 .../Commands/Save to CSS.tmCommand            |   24 -
 bundles/less.tmbundle/README.md               |   47 -
 .../less.tmbundle/Syntaxes/LESS.tmLanguage    |  344 --
 bundles/less.tmbundle/info.plist              |   15 -
 bundles/less.tmbundle/sample.less             |   44 -
 bundles/less.tmbundle/sample.png              |  Bin 74284 -> 0 bytes
 bundles/ruby-on-rails.tmbundle/.gitignore     |    3 -
 bundles/ruby-on-rails.tmbundle/ABOUT          |   36 -
 bundles/ruby-on-rails.tmbundle/CHANGELOG      |  109 -
 bundles/ruby-on-rails.tmbundle/Capfile        |    3 -
 ...gn Key Fixture Reference (habtm).tmCommand |   25 -
 ...te Foreign Key Fixture Reference.tmCommand |   25 -
 .../Clone Development DB to Test DB.tmCommand |   24 -
 .../Commands/DB Schema Dump.plist             |   24 -
 .../Commands/DB Schema Import.plist           |   24 -
 .../Generate Quick Migration.tmCommand        |   25 -
 .../Commands/Generate.plist                   |   24 -
 .../Commands/Go To Alternate File.plist       |   23 -
 .../Commands/Go To File on This Line.plist    |   23 -
 .../Commands/Go To File.plist                 |   23 -
 .../Commands/Go To Functional Test.plist      |   23 -
 .../Commands/Go To Helper.plist               |   23 -
 .../Commands/Go To Javascript.plist           |   23 -
 .../Commands/Go To Model.tmCommand            |   23 -
 .../Commands/Go To Stylesheet.plist           |   23 -
 .../Commands/Go To Unit Test.plist            |   23 -
 .../Commands/Go To View.plist                 |   23 -
 .../Commands/Go to Fixture.tmCommand          |   23 -
 .../Commands/Install Bundled Plugin.plist     |   23 -
 .../Load Fixtures (Test DB).tmCommand         |   24 -
 .../Commands/Load Fixtures.tmCommand          |   24 -
 .../Make Selection in to Partial.plist        |   26 -
 .../Migrate to Previous Version.tmCommand     |   29 -
 .../Rake Migrate to Version.tmCommand         |   28 -
 .../Commands/Rake Migrate.plist               |   24 -
 .../Commands/Redo Last Migration.tmCommand    |   24 -
 .../Commands/Show DB Schema.tmCommand         |   24 -
 .../Commands/Test All.tmCommand               |   23 -
 .../Commands/Test Functionals.tmCommand       |   23 -
 .../Commands/Test Integration.tmCommand       |   23 -
 .../Commands/Test Plugins.tmCommand           |   23 -
 .../Commands/Test Recent.tmCommand            |   23 -
 .../Commands/Test Uncommitted.tmCommand       |   23 -
 .../Commands/Test Units.tmCommand             |   23 -
 .../Commands/View demo help.tmCommand         |   27 -
 .../Require Rails File.tmDragCommand          |   41 -
 bundles/ruby-on-rails.tmbundle/LICENSE        |    7 -
 .../Macros/Add %3A Remove Column.tmMacro      |   44 -
 .../Macros/Add %3A Remove Index.tmMacro       |   44 -
 .../Macros/Add %3A Remove Named Index.tmMacro |   44 -
 ...%3A Remove Several Columns (marcc).tmMacro |   44 -
 .../Add %3A Remove Several Columns.tmMacro    |   44 -
 .../Add %3A Remove Unique Index.tmMacro       |   44 -
 .../Macros/Change : Change Table.tmMacro      |   44 -
 .../Macros/Create %3A Drop Table.tmMacro      |   44 -
 .../Macros/Drop %3A Create Table.tmMacro      |   48 -
 .../Macros/Remove %3A Add Column.tmMacro      |   48 -
 ... %3A Rename Several Columns (mncc).tmMacro |   44 -
 .../Rename %3A Rename Several Columns.tmMacro |   44 -
 .../Macros/Rename Column.tmMacro              |   44 -
 .../Macros/Rename Table.tmMacro               |   44 -
 .../Preferences/Template (ERB).tmPreferences  |   48 -
 .../Preferences/Template (Haml).tmPreferences |   48 -
 bundles/ruby-on-rails.tmbundle/README         |   38 -
 bundles/ruby-on-rails.tmbundle/Rakefile       |   19 -
 .../Snippets/$LABEL.tmSnippet                 |   16 -
 ...ixtures_identify(%3Asymbol) %%3E.tmSnippet |   16 -
 .../Snippets/180 rails form_tag.plist         |   18 -
 .../Snippets/Create binary column.tmSnippet   |   17 -
 .../Snippets/Create boolean column.tmSnippet  |   17 -
 .../Create controller class.tmSnippet         |   25 -
 .../Snippets/Create date column.tmSnippet     |   17 -
 .../Snippets/Create datetime column.tmSnippet |   17 -
 .../Snippets/Create decimal column.tmSnippet  |   17 -
 .../Snippets/Create float column.tmSnippet    |   17 -
 .../Create functional test class.tmSnippet    |   21 -
 .../Snippets/Create integer column.tmSnippet  |   17 -
 .../Create lock_version column.tmSnippet      |   17 -
 .../Create references column.tmSnippet        |   17 -
 .../Snippets/Create string column.tmSnippet   |   17 -
 .../Snippets/Create text column.tmSnippet     |   17 -
 .../Snippets/Create time column.tmSnippet     |   17 -
 .../Create timestamp column.tmSnippet         |   17 -
 .../Create timestamps columns.tmSnippet       |   17 -
 .../Migration Create Column (mcc).plist       |   17 -
 ...ration Create Column Continue (mccc).plist |   17 -
 .../Migration Drop Create Table (mdct).plist  |   16 -
 ...gration Remove and Add Column (mrac).plist |   16 -
 .../RAILS_DEFAULT_LOGGER.debug (rdb).plist    |   16 -
 .../Snippets/Table column(s) rename.tmSnippet |   17 -
 .../Test Assert Redirected To (art).plist     |   16 -
 .../Snippets/Test Assert Response (are).plist |   16 -
 .../Snippets/after_create.tmSnippet           |   16 -
 .../Snippets/after_destroy.tmSnippet          |   16 -
 .../Snippets/after_save.tmSnippet             |   16 -
 .../Snippets/after_update.tmSnippet           |   16 -
 .../Snippets/after_validation.tmSnippet       |   16 -
 .../after_validation_on_create.tmSnippet      |   16 -
 .../after_validation_on_update.tmSnippet      |   16 -
 .../assert(var = assigns(%3Avar)).tmSnippet   |   17 -
 .../Snippets/assert_difference.tmSnippet      |   18 -
 .../Snippets/assert_no_difference.tmSnippet   |   18 -
 ...directed_to (nested path plural).tmSnippet |   16 -
 ...sert_redirected_to (nested path).tmSnippet |   16 -
 ...sert_redirected_to (path plural).tmSnippet |   16 -
 .../assert_redirected_to (path).tmSnippet     |   16 -
 .../Snippets/assert_rjs.tmSnippet             |   16 -
 .../Snippets/assert_select.tmSnippet          |   18 -
 .../Snippets/before_create.tmSnippet          |   16 -
 .../Snippets/before_destroy.tmSnippet         |   16 -
 .../Snippets/before_save.tmSnippet            |   16 -
 .../Snippets/before_update.tmSnippet          |   16 -
 .../Snippets/before_validation.tmSnippet      |   16 -
 .../before_validation_on_create.tmSnippet     |   16 -
 .../before_validation_on_update.tmSnippet     |   16 -
 .../Snippets/belongs_to (bt).plist            |   16 -
 .../Snippets/cattr_accessor.tmSnippet         |   16 -
 .../Snippets/def create - resource.tmSnippet  |   30 -
 .../Snippets/def get request.tmSnippet        |   21 -
 .../Snippets/def post request.tmSnippet       |   21 -
 .../Snippets/end.tmSnippet                    |   16 -
 .../Snippets/find(%3Aall).tmSnippet           |   16 -
 .../Snippets/find(%3Afirst).tmSnippet         |   16 -
 .../Snippets/find(id).tmSnippet               |   16 -
 .../Snippets/for loop erb.tmSnippet           |   23 -
 .../Snippets/form_for check_box.tmSnippet     |   16 -
 .../Snippets/form_for checkbox.tmSnippet      |   16 -
 .../Snippets/form_for file_field 2.tmSnippet  |   16 -
 .../Snippets/form_for file_field.tmSnippet    |   16 -
 .../form_for hidden_field 2.tmSnippet         |   16 -
 .../Snippets/form_for hidden_field.tmSnippet  |   16 -
 .../Snippets/form_for label 2.tmSnippet       |   16 -
 .../Snippets/form_for label.tmSnippet         |   16 -
 .../form_for password_field 2.tmSnippet       |   16 -
 .../form_for password_field.tmSnippet         |   16 -
 .../Snippets/form_for radio_box 2.tmSnippet   |   16 -
 .../Snippets/form_for radio_box.tmSnippet     |   16 -
 .../Snippets/form_for submit 2.tmSnippet      |   16 -
 .../Snippets/form_for submit.tmSnippet        |   16 -
 .../Snippets/form_for text_area 2.tmSnippet   |   16 -
 .../Snippets/form_for text_area.tmSnippet     |   16 -
 .../Snippets/form_for text_field 2.tmSnippet  |   16 -
 .../Snippets/form_for text_field.tmSnippet    |   16 -
 .../Snippets/form_for with errors.tmSnippet   |   20 -
 .../Snippets/form_for.tmSnippet               |   18 -
 .../has_and_belongs_to_many (habtm).plist     |   16 -
 .../Snippets/has_many (hm).plist              |   16 -
 .../Snippets/has_many (through).tmSnippet     |   16 -
 .../has_many :dependent => :destroy.tmSnippet |   16 -
 .../Snippets/has_one (ho).plist               |   16 -
 .../Snippets/image_submit_tag.tmSnippet       |   16 -
 .../Snippets/javascript_include_tag.tmSnippet |   16 -
 .../ruby-on-rails.tmbundle/Snippets/lia.plist |   16 -
 .../Snippets/liai.plist                       |   16 -
 .../ruby-on-rails.tmbundle/Snippets/lic.plist |   16 -
 .../Snippets/lica.plist                       |   16 -
 .../Snippets/licai.plist                      |   16 -
 .../link_to (nested path plural).tmSnippet    |   16 -
 .../Snippets/link_to (nested path).tmSnippet  |   16 -
 .../Snippets/link_to (path plural).tmSnippet  |   16 -
 .../Snippets/link_to (path).tmSnippet         |   16 -
 .../Snippets/link_to model.tmSnippet          |   16 -
 .../Snippets/logger_debug.tmSnippet           |   16 -
 .../Snippets/logger_error.tmSnippet           |   16 -
 .../Snippets/logger_fatal.tmSnippet           |   16 -
 .../Snippets/logger_info.tmSnippet            |   16 -
 .../Snippets/logger_warn.tmSnippet            |   16 -
 .../Snippets/map(&%3Asym_proc).tmSnippet      |   16 -
 .../Snippets/map_catch_all.tmSnippet          |   17 -
 .../Snippets/map_named_route.tmSnippet        |   16 -
 .../Snippets/map_resource.tmSnippet           |   18 -
 .../Snippets/map_resources.tmSnippet          |   18 -
 .../Snippets/map_with_options.tmSnippet       |   19 -
 .../Snippets/mattr_accessor.tmSnippet         |   16 -
 .../Snippets/named_scope lambda.tmSnippet     |   17 -
 .../Snippets/named_scope.tmSnippet            |   17 -
 .../Snippets/page_hide (%2Aids).tmSnippet     |   16 -
 ...ert_html (position, id, partial).tmSnippet |   16 -
 .../page_replace (id, partial).tmSnippet      |   16 -
 .../page_replace_html (id, partial).tmSnippet |   16 -
 .../Snippets/page_show (%2Aids).tmSnippet     |   16 -
 .../Snippets/page_toggle (%2Aids).tmSnippet   |   16 -
 .../page_visual_effect (effect, id).tmSnippet |   16 -
 .../Snippets/rails flash.plist                |   16 -
 .../Snippets/rails params.plist               |   16 -
 .../Snippets/rails session.plist              |   16 -
 .../ruby-on-rails.tmbundle/Snippets/rea.plist |   16 -
 .../Snippets/reai.plist                       |   16 -
 .../ruby-on-rails.tmbundle/Snippets/rec.plist |   16 -
 .../Snippets/reca.plist                       |   16 -
 .../Snippets/recai.plist                      |   16 -
 ...redirect_to (nested path plural).tmSnippet |   16 -
 .../redirect_to (nested path).tmSnippet       |   16 -
 .../redirect_to (path plural).tmSnippet       |   16 -
 .../Snippets/redirect_to (path).tmSnippet     |   16 -
 .../Snippets/render (action)... (ra).plist    |   16 -
 .../render (action,layout) (ral).plist        |   16 -
 .../Snippets/render (file) (rf).plist         |   16 -
 .../render (file,use_full_path) (rfu).plist   |   16 -
 .../Snippets/render (inline) (ri).plist       |   16 -
 .../render (inline,locals) (ril).plist        |   16 -
 .../Snippets/render (inline,type) (rit).plist |   16 -
 .../Snippets/render (layout) (rl).plist       |   16 -
 .../Snippets/render (nothing) (rn).plist      |   16 -
 .../render (nothing,status) (rns).plist       |   16 -
 .../Snippets/render (partial) (rp).plist      |   16 -
 .../render (partial,collection) (rpc).plist   |   16 -
 .../render (partial,locals) (rpl).plist       |   16 -
 .../render (partial,object) (rpo).plist       |   16 -
 .../render (partial,status) (rps).plist       |   16 -
 .../Snippets/render (text) (rt).plist         |   16 -
 .../Snippets/render (text,layout) (rtl).plist |   16 -
 .../render (text,layout=%3Etrue) (rtlt).plist |   16 -
 .../Snippets/render (text,status) (rts).plist |   16 -
 .../Snippets/render (update).tmSnippet        |   18 -
 .../Snippets/respond_to (html).tmSnippet      |   21 -
 .../Snippets/respond_to.tmSnippet             |   18 -
 ... do %7Cvariable%7C %E2%80%A6 end.tmSnippet |   18 -
 .../Snippets/stylesheet_link_tag.tmSnippet    |   16 -
 .../Snippets/submit_tag.tmSnippet             |   16 -
 .../Snippets/t_binary (tcbi).tmSnippet        |   17 -
 .../Snippets/t_boolean (tcb).tmSnippet        |   17 -
 .../Snippets/t_date (tcda).tmSnippet          |   17 -
 .../Snippets/t_datetime (tcdt).tmSnippet      |   17 -
 .../Snippets/t_decimal (tcd).tmSnippet        |   17 -
 .../Snippets/t_float (tcf).tmSnippet          |   17 -
 .../Snippets/t_integer (tci).tmSnippet        |   17 -
 .../Snippets/t_lock_version (tcl).tmSnippet   |   17 -
 .../Snippets/t_references (tcr).tmSnippet     |   17 -
 .../Snippets/t_rename (tre).tmSnippet         |   17 -
 .../Snippets/t_string (tcs).tmSnippet         |   17 -
 .../Snippets/t_text (tct).tmSnippet           |   17 -
 .../Snippets/t_time (tcti).tmSnippet          |   17 -
 .../Snippets/t_timestamp (tcts).tmSnippet     |   17 -
 .../Snippets/t_timestamps (tctss).tmSnippet   |   17 -
 .../validates_acceptance_of if.tmSnippet      |   16 -
 .../validates_acceptance_of.tmSnippet         |   16 -
 .../Snippets/validates_associated (va).plist  |   16 -
 .../validates_associated if (vaif).plist      |   16 -
 .../validates_confirmation_of (vc).plist      |   16 -
 .../validates_confirmation_of if (vcif).plist |   16 -
 .../validates_exclusion_of (ve).plist         |   16 -
 .../validates_exclusion_of if (veif).plist    |   16 -
 .../Snippets/validates_format_of if.tmSnippet |   16 -
 .../Snippets/validates_format_of.tmSnippet    |   16 -
 .../validates_inclusion_of if.tmSnippet       |   16 -
 .../Snippets/validates_inclusion_of.tmSnippet |   16 -
 .../Snippets/validates_length_of (vl).plist   |   16 -
 .../Snippets/validates_length_of if.tmSnippet |   16 -
 .../validates_numericality_of if.tmSnippet    |   16 -
 .../validates_numericality_of.tmSnippet       |   16 -
 .../Snippets/validates_presence_of (vp).plist |   16 -
 .../validates_presence_of if (vpif) 2.plist   |   16 -
 .../validates_uniqueness_of (vu).plist        |   16 -
 .../validates_uniqueness_of if (vuif).plist   |   16 -
 .../Snippets/verify (verify).plist            |   19 -
 .../Snippets/verify - redirect (verify).plist |   19 -
 .../Snippets/wants_format.tmSnippet           |   16 -
 .../Snippets/xhr delete.tmSnippet             |   16 -
 .../Snippets/xhr get.tmSnippet                |   16 -
 .../Snippets/xhr post.tmSnippet               |   16 -
 .../Snippets/xhr put.tmSnippet                |   16 -
 .../bin/create_partial_from_selection.rb      |   94 -
 .../Support/bin/fixture_auto_complete.rb      |   84 -
 .../Support/bin/generate.rb                   |   71 -
 .../Support/bin/generate_quick_migration.rb   |   60 -
 .../Support/bin/go_to_alternate_file.rb       |   13 -
 .../Support/bin/go_to_file_on_current_line.rb |   13 -
 .../bin/insert_add_column_or_create_table.rb  |   67 -
 .../bin/intelligent_migration_snippet.rb      |  102 -
 .../Support/bin/list_plugins.rb               |   42 -
 .../Support/bin/rake_helper.rb                |  128 -
 .../Support/bin/show_schema.rb                |   36 -
 .../Support/images/home.gif                   |  Bin 1018 -> 0 bytes
 .../Support/images/install.gif                |  Bin 763 -> 0 bytes
 .../Support/images/rails.png                  |  Bin 16531 -> 0 bytes
 .../Support/images/svn.png                    |  Bin 929 -> 0 bytes
 .../Support/javascripts/prototype.js          | 4221 -----------------
 .../Support/lib/rails/buffer.rb               |  116 -
 .../Support/lib/rails/command_go_to_file.rb   |  199 -
 .../Support/lib/rails/generate.rb             |   56 -
 .../Support/lib/rails/inflections.rb          |   53 -
 .../Support/lib/rails/inflector.rb            |  282 --
 .../Support/lib/rails/misc.rb                 |   61 -
 .../Support/lib/rails/rails_path.rb           |  318 --
 .../Support/lib/rails/text_mate.rb            |   91 -
 .../Support/lib/rails/unobtrusive_logger.rb   |   23 -
 .../Support/lib/rails_bundle_tools.rb         |   23 -
 .../Support/plugins/footnotes-edge/init.rb    |   20 -
 .../footnotes-edge/lib/textmate_backtracer.rb |   42 -
 .../footnotes-edge/lib/textmate_footnotes.rb  |  257 -
 .../footnotes-edge/lib/textmate_initialize.rb |   14 -
 .../templates/rescues/template_error.erb      |   21 -
 .../footnotes-edge/test/mock_controller.rb    |   65 -
 .../test/textmate_footnotes_test.rb           |   85 -
 .../Support/plugins/footnotes/init.rb         |   20 -
 .../footnotes/lib/textmate_backtracer.rb      |   42 -
 .../footnotes/lib/textmate_footnotes.rb       |  264 --
 .../footnotes/lib/textmate_initialize.rb      |   14 -
 .../templates/rescues/template_error.rhtml    |   21 -
 .../plugins/footnotes/test/mock_controller.rb |   65 -
 .../footnotes/test/textmate_footnotes_test.rb |   85 -
 .../Support/templates/list_plugins.rhtml      |  267 --
 .../app/controllers/admin/base_controller.rb  |    9 -
 .../app/controllers/posts_controller.rb       |   24 -
 .../app/controllers/user_controller.rb        |    9 -
 .../app/controllers/users_controller.rb       |   31 -
 .../app_fixtures/app/helpers/user_helper.rb   |    2 -
 .../test/app_fixtures/app/models/notifier.rb  |    6 -
 .../test/app_fixtures/app/models/person.rb    |    2 -
 .../test/app_fixtures/app/models/user.rb      |    2 -
 .../app/views/admin/base/action.html.erb      |    0
 .../views/notifier/forgot_password.html.erb   |   15 -
 .../app_fixtures/app/views/user/new.rhtml     |    0
 .../app/views/users/create.html.erb           |    0
 .../app/views/users/existing_views.html.erb   |    1 -
 .../app/views/users/existing_views.js.rjs     |    1 -
 .../app/views/users/existing_views.wacky.erb  |    1 -
 .../views/users/existing_views.xml.builder    |    1 -
 .../app_fixtures/app/views/users/new.html.erb |    0
 .../Support/test/app_fixtures/config/boot.rb  |  109 -
 .../test/app_fixtures/config/environment.rb   |  109 -
 .../Support/test/app_fixtures/script/generate |    3 -
 .../app/controllers/posts_controller.rb       |   24 -
 .../test/fixtures/vendor/plugins/haml/init.rb |    0
 .../Support/test/test_buffer.rb               |  118 -
 .../Support/test/test_generator.rb            |   29 -
 .../Support/test/test_helper.rb               |    9 -
 .../Support/test/test_rails_path.rb           |  289 --
 .../Support/test/test_text_mate.rb            |    1 -
 .../Support/test/text_mate_mock.rb            |   45 -
 .../Syntaxes/HTML (Rails).plist               |   92 -
 .../Syntaxes/JavaScript (Rails).tmLanguage    |   82 -
 .../Syntaxes/RJS.tmLanguage                   |   25 -
 .../Syntaxes/Ruby on Rails.plist              |  288 --
 .../Syntaxes/SQL (Rails).plist                |   51 -
 bundles/ruby-on-rails.tmbundle/TODO           |   24 -
 .../ruby-on-rails.tmbundle/config/deploy.rb   |    6 -
 .../config/slicehost.yml.sample               |    3 -
 .../config/website.yml.sample                 |    2 -
 bundles/ruby-on-rails.tmbundle/info.plist     |  889 ----
 .../script/clean_bundle_file_names            |   46 -
 bundles/ruby-on-rails.tmbundle/script/destroy |   14 -
 .../ruby-on-rails.tmbundle/script/generate    |   14 -
 .../ruby-on-rails.tmbundle/script/txt2html    |   97 -
 .../ruby-on-rails.tmbundle/tasks/dist.rake    |    9 -
 .../ruby-on-rails.tmbundle/tasks/website.rake |   35 -
 .../ruby-on-rails.tmbundle/website/demo.html  | 1016 ----
 .../ruby-on-rails.tmbundle/website/demo.txt   |  738 ---
 .../website/images/logo_bundle.png            |  Bin 1975 -> 0 bytes
 .../ruby-on-rails.tmbundle/website/index.html |   99 -
 .../ruby-on-rails.tmbundle/website/index.txt  |   31 -
 .../javascripts/rounded_corners_lite.inc.js   |  285 --
 .../website/peepcode.html                     |  520 --
 .../website/peepcode.txt                      |  327 --
 .../website/stylesheets/screen.css            |  177 -
 .../website/template.html.erb                 |   60 -
 .../Commands/Check ERB Syntax.plist           |   27 -
 .../Commands/Check Ruby Syntax.plist          |   28 -
 .../Completion: Ruby (rcodetools).tmCommand   |   72 -
 .../Convert Ruby hash to 1_9 syntax.tmCommand |   29 -
 .../Enclose in * (RDoc comments).tmCommand    |   33 -
 .../Enclose in + (RDoc comments).tmCommand    |   33 -
 .../Enclose in _ (RDoc comments).tmCommand    |   33 -
 .../Commands/Execute Line with Ruby.plist     |   47 -
 .../Execute and Insert Results.tmCommand      |   29 -
 .../Commands/Insert Missing Requires.plist    |   51 -
 .../Commands/Lookup in Documentation.plist    |   24 -
 .../Commands/Make Destructive Call.plist      |   29 -
 .../ruby.tmbundle/Commands/New Method.plist   |   39 -
 .../Commands/Omit from RDoc.tmCommand         |   31 -
 .../Commands/Open Require.tmCommand           |   65 -
 .../Commands/Run Rake Task.tmCommand          |   27 -
 .../Commands/Run focused unit test.plist      |   35 -
 bundles/ruby.tmbundle/Commands/Run.tmCommand  |   29 -
 .../Commands/Show RDoc for this file.plist    |   37 -
 .../Commands/Toggle ERb Tags.tmCommand        |   59 -
 .../Commands/Toggle Quote Style.plist         |   55 -
 .../Commands/Toggle String:Symbol.tmCommand   |   35 -
 .../Toggle ‘do … end’ : ‘{ … }’.tmCommand     |  150 -
 .../Commands/word_wrap()  (worw).plist        |   31 -
 .../Require Ruby File.tmDragCommand           |   39 -
 .../Benchmark_bmbm(__) do __ end.tmMacro      |   54 -
 .../Macros/Delete forward:backward.tmMacro    |   25 -
 .../Macros/Overwrite } in #{ .. }.plist       |   54 -
 .../Macros/PStore_new( __ ).tmMacro           |   51 -
 .../Macros/YAML.dump(.., file)  (Yd).plist    |   57 -
 .../Macros/YAML.load(file)  (Yl).plist        |   57 -
 ...eClass .. initialize .. end  (class).plist |   63 -
 .../each_char { |chr| .. }  (eac).plist       |   55 -
 .../each_cons(..) { |group| .. }  (eac).plist |   55 -
 ...each_slice(..) { |group| .. }  (eas).plist |   55 -
 .../Macros/extend Forwardable  (Forw).plist   |   55 -
 ...ap_with_index { |e, i| .. }  (mapwi).plist |   55 -
 .../Macros/require_gem \"__\".tmMacro"        |   51 -
 .../ruby.tmbundle/Macros/xmlread(__).tmMacro  |   51 -
 .../Preferences/Block typing pairs.plist      |   42 -
 .../ruby.tmbundle/Preferences/Comments.plist  |   38 -
 ...Completion: ENV[…] variables.tmPreferences |   17 -
 .../Completion: require strings.tmPreferences |   22 -
 .../Preferences/Miscellaneous.plist           |   44 -
 .../Preferences/Symbo List: Method.plist      |   19 -
 ...ymbol List: No Function Call.tmPreferences |   17 -
 .../Snippets/# encoding:  UTF-8.tmSnippet     |   17 -
 .../Snippets/#!;usr;local;bin;ruby -w.plist   |   17 -
 .../Snippets/060 ruby if else.plist           |   20 -
 .../ruby.tmbundle/Snippets/070 ruby if.plist  |   18 -
 .../Snippets/080 ruby case.plist              |   19 -
 .../Snippets/:yields: RDoc comment.tmSnippet  |   16 -
 .../Snippets/Add '# =>' Marker.tmSnippet      |   16 -
 .../Array.new(10) { |i| .. }  (Arr).plist     |   16 -
 .../Benchmark_bmbm(__) do __ end.tmSnippet    |   19 -
 ...lob(\"..\") do |file| .. end  (Dir).plist" |   16 -
 .../Snippets/Dir[\"__\"].tmSnippet"           |   16 -
 ...h (\"..\") do |line| .. end  (File).plist" |   16 -
 ...File_open(\"__\") { |file| __ }.tmSnippet" |   16 -
 .../Snippets/File_read(\"__\").tmSnippet"     |   16 -
 ... |hash, key| hash[key] = .. }  (Has).plist |   16 -
 ...sert ERb's <% __ %> or <%= __ %>.tmSnippet |   16 -
 .../Marshal.dump(obj, file)  (Md).plist       |   16 -
 .../Snippets/Marshal.load(obj)  (Ml).plist    |   16 -
 .../Snippets/PStore_new( __ ).tmSnippet       |   16 -
 .../RDoc documentation block.tmSnippet        |   20 -
 .../Wrap in Begin … Rescue … End.plist        |   23 -
 .../Snippets/YAML.dump(.., file)  (Yd-).plist |   16 -
 .../Snippets/YAML.load(file)  (Yl-).plist     |   16 -
 .../ruby.tmbundle/Snippets/__END__.tmSnippet  |   17 -
 .../Snippets/alias_method ..  (am).plist      |   16 -
 .../Snippets/all? { |e| .. }  (all).plist     |   16 -
 .../Snippets/any? { |e| .. }  (any).plist     |   16 -
 .../Snippets/application_code ..  (app).plist |   18 -
 .../Snippets/assert(..)  (as).plist           |   16 -
 .../Snippets/assert_equal.tmSnippet           |   16 -
 .../assert_in_delta(..)  (asid).plist         |   16 -
 .../assert_instance_of(..)  (asio).plist      |   16 -
 .../Snippets/assert_kind_of(..)  (asko).plist |   16 -
 .../Snippets/assert_match(..)  (asm).plist    |   16 -
 .../Snippets/assert_nil(..)  (asn).plist      |   16 -
 .../assert_no_match(..)  (asnm).plist         |   16 -
 .../assert_not_equal(..)  (asne).plist        |   16 -
 .../Snippets/assert_not_nil(..)  (asnn).plist |   16 -
 .../assert_not_same(..)  (asns).plist         |   16 -
 ...rt_nothing_raised(..) { .. }  (asnr).plist |   16 -
 ...assert_nothing_thrown { .. }  (asnt).plist |   16 -
 .../Snippets/assert_operator(..)  (aso).plist |   16 -
 .../assert_raise(..) { .. }  (asr).plist      |   16 -
 .../assert_respond_to(..)  (asrt).plist       |   16 -
 .../Snippets/assert_same(..)  (ass).plist     |   16 -
 .../Snippets/assert_send(..)  (ass).plist     |   16 -
 .../assert_throws(..) { .. }  (ast).plist     |   16 -
 .../Snippets/attr_accessor ..  (rw).plist     |   16 -
 .../Snippets/attr_reader ..  (r).plist        |   16 -
 .../Snippets/attr_writer ..  (w).plist        |   16 -
 ...eClass .. initialize .. end  (class).plist |   24 -
 .... < ParentClass .. initialize .. end.plist |   22 -
 ...ass .. < Struct .. initialize .. end.plist |   22 -
 ... < Test;;Unit;;TestCase .. end  (tc).plist |   24 -
 .../Snippets/class .. end  (cla).plist        |   18 -
 .../Snippets/class .. initialize .. end.plist |   22 -
 ... undef .. initialize .. end  (class).plist |   30 -
 .../Snippets/class << self __ end.tmSnippet   |   18 -
 .../Snippets/class_from_name()  (clafn).plist |   16 -
 .../classify { |e| .. }  (clas).plist         |   16 -
 .../Snippets/collect { |e| .. }  (col).plist  |   16 -
 .../Snippets/deep_copy(..)  (dee).plist       |   16 -
 bundles/ruby.tmbundle/Snippets/def end.plist  |   18 -
 .../Snippets/def initialize __ end.tmSnippet  |   18 -
 .../def method_missing .. end  (mm).plist     |   18 -
 .../Snippets/def self .. end  (defs).plist    |   18 -
 .../Snippets/def test_ .. end  (t).plist      |   18 -
 .../Snippets/def_delegator .. (defd).plist    |   16 -
 .../Snippets/def_delegators .. (defds).plist  |   16 -
 .../Snippets/define_method ___ end.tmSnippet  |   18 -
 .../delete_if { |e| .. }  (deli).plist        |   16 -
 .../Snippets/detect { |e| .. }  (det).plist   |   16 -
 .../Snippets/directory().tmSnippet            |   16 -
 .../Snippets/do |obj| .. end (doo).plist      |   18 -
 .../downto(0) { |n| .. }  (dow).plist         |   16 -
 .../Snippets/each { |e| .. }  (ea).plist      |   16 -
 .../each_byte { |byte| .. }  (eab).plist      |   16 -
 .../each_char { |chr| .. }  (eac-).plist      |   16 -
 ...each_cons(..) { |group| .. }  (eac-).plist |   16 -
 .../each_index { |i| .. }  (eai).plist        |   16 -
 .../each_key { |key| .. }  (eak).plist        |   16 -
 .../each_line { |line| .. }  (eal).plist      |   16 -
 .../each_pair { |name, val| .. }  (eap).plist |   16 -
 .../each_slice { |group| .. }  (eas).plist    |   16 -
 .../each_value { |val| .. }  (eav).plist      |   16 -
 ...ach_with_index { |e, i| .. }  (eawi).plist |   16 -
 .../Snippets/elsif ___.tmSnippet              |   17 -
 .../Snippets/embed string variable.plist      |   16 -
 .../Snippets/extend Forwardable  (Forw).plist |   16 -
 .../fetch(name) { |key| .. }  (fet).plist     |   16 -
 .../fill(range) { |i| .. }  (fil).plist       |   16 -
 .../Snippets/find { |e| .. }  (fin).plist     |   16 -
 .../find_all { |e| .. }  (fina).plist         |   16 -
 .../Snippets/flatten_once  (fla).plist        |   16 -
 .../Snippets/flunk(..)  (fl).plist            |   16 -
 ...rep(;pattern;) { |match| .. }  (gre).plist |   16 -
 .../gsub(;..;) { |match| .. }  (gsu).plist    |   16 -
 .../Snippets/hash pair (:).plist              |   16 -
 .../ruby.tmbundle/Snippets/hash pointer.plist |   16 -
 .../include Comparable ..  (Comp).plist       |   20 -
 .../include Enumerable ..  (Enum).plist       |   20 -
 ...nject(init) { |mem, var| .. }  (inj).plist |   16 -
 .../lambda { |args| .. }  (lam).plist         |   16 -
 .../Snippets/loop { __ }.tmSnippet            |   16 -
 .../Snippets/map { |e| .. }  (map).plist      |   16 -
 ...ap_with_index { |e, i| .. }  (mapwi).plist |   16 -
 .../Snippets/max { |a, b| .. }  (max).plist   |   16 -
 .../Snippets/min { |a, b| .. }  (min).plist   |   16 -
 .../module .. ClassMethods .. end.plist       |   29 -
 .../Snippets/module .. end.plist              |   18 -
 .../module .. module_function .. end.plist    |   20 -
 .../namespace :__ do __ end.tmSnippet         |   18 -
 .../Snippets/open yield block ({).plist       |   16 -
 ...url\", \"w\") do |doc| .. end (ope).plist" |   16 -
 .../option_parse { .. }  (optp).plist         |   43 -
 .../partition { |e| .. }  (par).plist         |   16 -
 .../ruby.tmbundle/Snippets/pass(__).tmSnippet |   16 -
 .../Snippets/path_from_here( __ ).tmSnippet   |   16 -
 .../Snippets/randomize  (ran).plist           |   16 -
 .../Snippets/reject { |e| .. }  (rej).plist   |   16 -
 .../Snippets/require \"..\"  (req).plist"     |   16 -
 .../require \"tc_..\" ..  (ts).plist"         |   20 -
 .../Snippets/require_gem \"__\".tmSnippet"    |   16 -
 .../results_report(__) { __ }.tmSnippet       |   16 -
 .../reverse_each { |e| .. }  (rea).plist      |   16 -
 .../scan(;..;) { |match| .. }  (sca).plist    |   16 -
 .../Snippets/select { |e| .. }  (sel).plist   |   16 -
 .../Snippets/singleton_class().tmSnippet      |   16 -
 .../ruby.tmbundle/Snippets/skip(__).tmSnippet |   16 -
 .../Snippets/sort { |a, b| .. }  (sor).plist  |   16 -
 .../Snippets/sort_by { |e| .. }  (sorb).plist |   16 -
 .../Snippets/step(2) { |e| .. }  (ste).plist  |   16 -
 .../sub(;..;) { |match| .. }  (sub).plist     |   16 -
 ...> [:dependent, :tasks] do __ end.tmSnippet |   19 -
 .../Snippets/times { |n| .. }  (tim).plist    |   16 -
 .../transaction( __ ) do __ end.tmSnippet     |   16 -
 .../Snippets/unix_filter .. (uni).plist       |   18 -
 .../Snippets/unless (unless).plist            |   18 -
 .../Snippets/until ___ end.tmSnippet          |   18 -
 bundles/ruby.tmbundle/Snippets/untitled.plist |   19 -
 .../upto(1.0;0.0) { |n| .. }  (upt).plist     |   16 -
 .../Snippets/usage_if()  (usai).plist         |   18 -
 .../Snippets/usage_unless()  (usau).plist     |   18 -
 bundles/ruby.tmbundle/Snippets/when.plist     |   17 -
 .../Snippets/while ___ end.tmSnippet          |   18 -
 .../Snippets/xmlread(__).tmSnippet            |   16 -
 .../Snippets/xpath(__) { __ }.tmSnippet       |   18 -
 .../zip(enums) { |row| .. }  (zip).plist      |   16 -
 .../Support/RakeMate/rake_mate.rb             |  100 -
 .../Support/RakeMate/run_rake_task.rb         |   47 -
 .../Support/RubyMate/catch_exception.rb       |   41 -
 .../Support/RubyMate/run_script.rb            |  133 -
 .../ruby.tmbundle/Support/RubyMate/test.rb    |   19 -
 .../ruby.tmbundle/Support/RubyMate/todo.txt   |   13 -
 .../Support/bin/insert_requires.rb            |  104 -
 .../ruby.tmbundle/Support/bin/linked_ri.rb    |  153 -
 .../Support/bin/make_destructive.rb           |   18 -
 .../Support/bin/snippet_paren.rb              |   10 -
 .../Support/lib/ruby_requires.rb              |   26 -
 bundles/ruby.tmbundle/Support/vendor/README   |    3 -
 .../Support/vendor/rcodetools/CHANGES         |   70 -
 .../Support/vendor/rcodetools/README          |   98 -
 .../Support/vendor/rcodetools/README.TDC      |  158 -
 .../Support/vendor/rcodetools/README.emacs    |   75 -
 .../Support/vendor/rcodetools/README.ja       |   84 -
 .../vendor/rcodetools/README.method_analysis  |   13 -
 .../Support/vendor/rcodetools/README.vim      |  111 -
 .../vendor/rcodetools/README.xmpfilter        |  287 --
 .../Support/vendor/rcodetools/Rakefile        |  121 -
 .../rcodetools/Rakefile.method_analysis       |   30 -
 .../Support/vendor/rcodetools/THANKS          |   11 -
 .../vendor/rcodetools/anything-rcodetools.el  |  151 -
 .../Support/vendor/rcodetools/bin/rbtest      |  266 --
 .../vendor/rcodetools/bin/rct-complete        |   45 -
 .../Support/vendor/rcodetools/bin/rct-doc     |   52 -
 .../Support/vendor/rcodetools/bin/rct-fork    |    6 -
 .../vendor/rcodetools/bin/rct-fork-client     |    5 -
 .../vendor/rcodetools/bin/rct-meth-args       |  442 --
 .../vendor/rcodetools/bin/ruby-toggle-file    |   26 -
 .../Support/vendor/rcodetools/bin/xmpfilter   |   85 -
 .../vendor/rcodetools/icicles-rcodetools.el   |   35 -
 .../vendor/rcodetools/lib/method_analyzer.rb  |  107 -
 .../rcodetools/lib/rcodetools/compat.rb       |   14 -
 .../rcodetools/lib/rcodetools/completion.rb   |  406 --
 .../vendor/rcodetools/lib/rcodetools/doc.rb   |  168 -
 .../vendor/rcodetools/lib/rcodetools/fork.rb  |  210 -
 .../rcodetools/lib/rcodetools/fork_config.rb  |   26 -
 .../rcodetools/lib/rcodetools/options.rb      |  136 -
 .../rcodetools/lib/rcodetools/xmpfilter.rb    |  379 --
 .../lib/rcodetools/xmptestunitfilter.rb       |  314 --
 .../vendor/rcodetools/lib/ruby_toggle_file.rb |   99 -
 .../Support/vendor/rcodetools/license.txt     |    8 -
 .../Support/vendor/rcodetools/rcodetools.el   |  430 --
 .../Support/vendor/rcodetools/rcodetools.elc  |  Bin 14540 -> 0 bytes
 .../Support/vendor/rcodetools/rcodetools.gif  |  Bin 32432 -> 0 bytes
 .../Support/vendor/rcodetools/rcodetools.sxmp |  Bin 4859 -> 0 bytes
 .../Support/vendor/rcodetools/rcodetools.vim  |  173 -
 .../Support/vendor/rcodetools/setup.rb        | 1585 -------
 .../vendor/rcodetools/test/attic/test_run.rb  |   45 -
 .../test/data/attic/add_markers-input.rb      |    2 -
 .../test/data/attic/add_markers-output.rb     |    2 -
 .../test/data/attic/bindings-input.rb         |   26 -
 .../test/data/attic/bindings-output.rb        |   31 -
 .../test/data/attic/completion-input.rb       |    1 -
 .../test/data/attic/completion-output.rb      |    2 -
 .../data/attic/completion_class_info-input.rb |    1 -
 .../attic/completion_class_info-output.rb     |   10 -
 ...mpletion_class_info_no_candidates-input.rb |    1 -
 ...pletion_class_info_no_candidates-output.rb |    1 -
 .../attic/completion_detect_rbtest-input.rb   |    7 -
 .../attic/completion_detect_rbtest-output.rb  |    2 -
 .../attic/completion_detect_rbtest2-input.rb  |    1 -
 .../attic/completion_detect_rbtest2-output.rb |    2 -
 .../test/data/attic/completion_emacs-input.rb |    1 -
 .../data/attic/completion_emacs-output.rb     |    6 -
 .../attic/completion_emacs_icicles-input.rb   |    1 -
 .../attic/completion_emacs_icicles-output.rb  |    6 -
 .../data/attic/completion_in_method-input.rb  |    3 -
 .../data/attic/completion_in_method-output.rb |    1 -
 .../data/attic/completion_in_method-test.rb   |    6 -
 .../data/attic/completion_rbtest-input.rb     |    7 -
 .../data/attic/completion_rbtest-output.rb    |    2 -
 .../rcodetools/test/data/attic/doc-input.rb   |    1 -
 .../rcodetools/test/data/attic/doc-output.rb  |    1 -
 .../data/attic/doc_detect_rbtest-input.rb     |    1 -
 .../data/attic/doc_detect_rbtest-output.rb    |    1 -
 .../data/attic/doc_detect_rbtest2-input.rb    |    7 -
 .../data/attic/doc_detect_rbtest2-output.rb   |    1 -
 .../test/data/attic/doc_rbtest-input.rb       |    7 -
 .../test/data/attic/doc_rbtest-output.rb      |    1 -
 .../test/data/attic/no_warnings-input.rb      |    3 -
 .../test/data/attic/no_warnings-output.rb     |    4 -
 .../rcodetools/test/data/attic/refe-input.rb  |    1 -
 .../rcodetools/test/data/attic/refe-output.rb |    1 -
 .../rcodetools/test/data/attic/ri-input.rb    |    1 -
 .../rcodetools/test/data/attic/ri-output.rb   |    1 -
 .../test/data/attic/ri_emacs-input.rb         |    1 -
 .../test/data/attic/ri_emacs-output.rb        |    1 -
 .../test/data/attic/ri_vim-input.rb           |    1 -
 .../test/data/attic/ri_vim-output.rb          |    1 -
 .../rcodetools/test/data/attic/rspec-input.rb |   48 -
 .../test/data/attic/rspec-output.rb           |   52 -
 .../test/data/attic/rspec_poetry-input.rb     |   48 -
 .../test/data/attic/rspec_poetry-output.rb    |   52 -
 .../data/attic/simple_annotation-input.rb     |    8 -
 .../data/attic/simple_annotation-output.rb    |    8 -
 .../test/data/attic/unit_test-input.rb        |   50 -
 .../test/data/attic/unit_test-output.rb       |   52 -
 .../attic/unit_test_detect_rbtest-input.rb    |   50 -
 .../attic/unit_test_detect_rbtest-output.rb   |   52 -
 .../attic/unit_test_detect_rbtest2-input.rb   |    6 -
 .../attic/unit_test_detect_rbtest2-output.rb  |    6 -
 .../test/data/attic/unit_test_poetry-input.rb |   50 -
 .../data/attic/unit_test_poetry-output.rb     |   52 -
 .../test/data/attic/unit_test_rbtest-input.rb |    6 -
 .../data/attic/unit_test_rbtest-output.rb     |    6 -
 .../test/data/method_analyzer-data.rb         |   33 -
 .../rcodetools/test/data/method_args.data.rb  |  106 -
 .../completion_in_method__testmethod.taf      |   17 -
 .../completion_in_method__testscript.taf      |   17 -
 ...completion_in_method__wrong_testmethod.taf |   17 -
 .../test/data/rct-complete/completion.taf     |    9 -
 .../rct-complete/completion_class_info.taf    |    9 -
 .../completion_class_info_no_candidates.taf   |    8 -
 .../rct-complete/completion_detect_rbtest.taf |   15 -
 .../completion_detect_rbtest2.taf             |    9 -
 .../data/rct-complete/completion_emacs.taf    |   13 -
 .../rct-complete/completion_emacs_icicles.taf |   13 -
 .../data/rct-complete/completion_rbtest.taf   |   15 -
 .../rcodetools/test/data/rct-doc/doc.taf      |    8 -
 .../test/data/rct-doc/doc_detect_rbtest.taf   |    8 -
 .../test/data/rct-doc/doc_detect_rbtest2.taf  |   14 -
 .../test/data/rct-doc/doc_rbtest.taf          |   14 -
 .../rcodetools/test/data/rct-doc/refe.taf     |    8 -
 .../rcodetools/test/data/rct-doc/ri.taf       |    8 -
 .../rcodetools/test/data/rct-doc/ri_emacs.taf |    8 -
 .../rcodetools/test/data/rct-doc/ri_vim.taf   |    8 -
 .../test/data/sample_test_script.rb           |    9 -
 .../test/data/xmpfilter/add_markers.taf       |   10 -
 .../test/data/xmpfilter/bindings.taf          |   63 -
 .../test/data/xmpfilter/comment_out.taf       |   22 -
 .../test/data/xmpfilter/exception.taf         |   14 -
 .../test/data/xmpfilter/expectations.taf      |   54 -
 .../test/data/xmpfilter/last_match.taf        |   18 -
 .../rcodetools/test/data/xmpfilter/mult.rb    |    9 -
 .../xmpfilter/multi_line_annotation_1.taf     |   22 -
 .../xmpfilter/multi_line_annotation_2.taf     |   24 -
 .../xmpfilter/multi_line_annotation_3.taf     |   20 -
 .../xmpfilter/multi_line_annotation_4.taf     |   22 -
 .../xmpfilter/multi_line_annotation_5.taf     |   34 -
 .../xmpfilter/multi_line_annotation_6.taf     |   12 -
 .../xmpfilter/multi_line_annotation_7.taf     |   23 -
 .../test/data/xmpfilter/no_warnings.taf       |   13 -
 .../test/data/xmpfilter/nospace.taf           |   16 -
 .../rcodetools/test/data/xmpfilter/rspec.taf  |  106 -
 .../test/data/xmpfilter/rspec_poetry.taf      |  106 -
 .../test/data/xmpfilter/simple_annotation.taf |   22 -
 .../test/data/xmpfilter/unit_test.taf         |  108 -
 .../xmpfilter/unit_test_detect_rbtest.taf     |  108 -
 .../xmpfilter/unit_test_detect_rbtest2.taf    |   18 -
 .../test/data/xmpfilter/unit_test_poetry.taf  |  108 -
 .../test/data/xmpfilter/unit_test_rbtest.taf  |   18 -
 .../rcodetools/test/data/xmpfilter/width.taf  |   16 -
 .../vendor/rcodetools/test/test_completion.rb |  674 ---
 .../vendor/rcodetools/test/test_doc.rb        |  446 --
 .../vendor/rcodetools/test/test_functional.rb |   47 -
 .../rcodetools/test/test_method_analyzer.rb   |  107 -
 .../rcodetools/test/test_method_args.rb       |  134 -
 .../vendor/rcodetools/test/test_options.rb    |   33 -
 .../rcodetools/test/test_ruby_toggle_file.rb  |  174 -
 .../vendor/rcodetools/test/test_xmpfilter.rb  |  221 -
 .../rcodetools/test/test_xmptestunitfilter.rb |   86 -
 .../vendor/rcodetools/test/tmp_functional.rb  |  162 -
 .../Support/vendor/rcodetools/test/tmp_run.rb |   66 -
 bundles/ruby.tmbundle/Syntaxes/Ruby.plist     | 2853 -----------
 .../ruby.tmbundle/Tests/division_ambiguity.rb |   88 -
 .../ruby.tmbundle/Tests/modulo_ambiguity1.rb  |   76 -
 .../Tests/questionmark_ambiguity1.rb          |  160 -
 bundles/ruby.tmbundle/Tests/rubylexer/COPYING |  510 --
 bundles/ruby.tmbundle/Tests/rubylexer/g.rb    |   14 -
 .../Tests/rubylexer/newsyntax.rb              |   18 -
 bundles/ruby.tmbundle/Tests/rubylexer/p.rb    | 1122 -----
 .../ruby.tmbundle/Tests/rubylexer/regtest.rb  |  621 ---
 bundles/ruby.tmbundle/Tests/rubylexer/w.rb    |   22 -
 bundles/ruby.tmbundle/Tests/test1.rb          |  302 --
 bundles/ruby.tmbundle/info.plist              |  636 ---
 .../Commands/Convert to ASCII.plist           |   20 -
 .../Commands/Convert to hex.plist             |   23 -
 ...Matching Lines into New Document.tmCommand |   37 -
 ...Matching Lines into New Document.tmCommand |   37 -
 .../Commands/Decrypt selection.plist          |   32 -
 .../Distill Document : Selection.tmCommand    |   43 -
 .../Commands/Duplicate Line.plist             |   38 -
 .../Commands/Encrypt selection.plist          |   33 -
 .../Commands/Enumerate Lines.plist            |   22 -
 .../Commands/Open Current URL.plist           |   25 -
 ...ze Lines in Document : Selection.tmCommand |   18 -
 .../text.tmbundle/Commands/Sort & Uniq.plist  |   20 -
 bundles/text.tmbundle/Commands/Sort.plist     |   22 -
 .../Speak Document : Selection.tmCommand      |   18 -
 .../Commands/Strip non-printables.plist       |   20 -
 .../Commands/Strip trailing spaces.plist      |   20 -
 .../text.tmbundle/Commands/Word Count.plist   |   36 -
 .../text.tmbundle/Macros/Delete Line.plist    |   25 -
 .../Delete to Beginning of Line.tmMacro       |   19 -
 .../text.tmbundle/Macros/EOL + . + LF.plist   |   31 -
 bundles/text.tmbundle/Macros/EOL + ..plist    |   29 -
 bundles/text.tmbundle/Macros/Join Lines.plist |   46 -
 .../Preferences/Markup style: Bold.plist      |   17 -
 .../Preferences/Markup style: Italic.plist    |   17 -
 .../Preferences/Markup style: Underline.plist |   17 -
 .../Preferences/Miscellaneous.plist           |   65 -
 .../Preferences/Spell checking.plist          |   17 -
 .../Snippets/010 Copyright.plist              |   14 -
 .../Snippets/Conitnue bullet.plist            |   17 -
 .../Snippets/Conitnue light bullet.plist      |   17 -
 .../Snippets/Conitnue star bullet.plist       |   17 -
 .../Snippets/Insert ISO date.plist            |   14 -
 .../text.tmbundle/Snippets/Lorem ipsum.plist  |   14 -
 .../text.tmbundle/Syntaxes/Plain text.plist   |   83 -
 .../Templates/Empty file/info.plist           |   14 -
 .../Templates/From Clipboard/info.plist       |   17 -
 bundles/text.tmbundle/info.plist              |  139 -
 1079 files changed, 31 insertions(+), 56442 deletions(-)
 delete mode 100644 bundles/CoffeeScriptBundle.tmbundle/.gitignore
 delete mode 100644 bundles/CoffeeScriptBundle.tmbundle/Commands/Align Assignments.tmCommand
 delete mode 100644 bundles/CoffeeScriptBundle.tmbundle/Commands/CoffeeScript.sublime-build
 delete mode 100644 bundles/CoffeeScriptBundle.tmbundle/Commands/Compile and Display JS.tmCommand
 delete mode 100644 bundles/CoffeeScriptBundle.tmbundle/Commands/Insert Heredoc comment.tmCommand
 delete mode 100644 bundles/CoffeeScriptBundle.tmbundle/Commands/Insert Heredoc triple double quotes.tmCommand
 delete mode 100644 bundles/CoffeeScriptBundle.tmbundle/Commands/Insert Heredoc triple single quotes.tmCommand
 delete mode 100644 bundles/CoffeeScriptBundle.tmbundle/Commands/New Function.tmCommand
 delete mode 100644 bundles/CoffeeScriptBundle.tmbundle/Commands/Run selected text.tmCommand
 delete mode 100644 bundles/CoffeeScriptBundle.tmbundle/Commands/Run.tmCommand
 delete mode 100644 bundles/CoffeeScriptBundle.tmbundle/Preferences/CoffeeScript.tmPreferences
 delete mode 100644 bundles/CoffeeScriptBundle.tmbundle/Preferences/Disable Indent Corrections.tmPreferences
 delete mode 100644 bundles/CoffeeScriptBundle.tmbundle/Preferences/Indent.tmPreferences
 delete mode 100644 bundles/CoffeeScriptBundle.tmbundle/Preferences/Symbol List Method 2.tmPreferences
 delete mode 100644 bundles/CoffeeScriptBundle.tmbundle/Preferences/Symbol List Method.tmPreferences
 delete mode 100644 bundles/CoffeeScriptBundle.tmbundle/README.markdown
 delete mode 100644 bundles/CoffeeScriptBundle.tmbundle/Snippets/Array comprehension.tmSnippet
 delete mode 100644 bundles/CoffeeScriptBundle.tmbundle/Snippets/Bound Function.tmSnippet
 delete mode 100644 bundles/CoffeeScriptBundle.tmbundle/Snippets/Class.tmSnippet
 delete mode 100644 bundles/CoffeeScriptBundle.tmbundle/Snippets/Else if.tmSnippet
 delete mode 100644 bundles/CoffeeScriptBundle.tmbundle/Snippets/Function.tmSnippet
 delete mode 100644 bundles/CoffeeScriptBundle.tmbundle/Snippets/If __ Else.tmSnippet
 delete mode 100644 bundles/CoffeeScriptBundle.tmbundle/Snippets/If.tmSnippet
 delete mode 100644 bundles/CoffeeScriptBundle.tmbundle/Snippets/Interpolated Code.tmSnippet
 delete mode 100644 bundles/CoffeeScriptBundle.tmbundle/Snippets/Object comprehension.tmSnippet
 delete mode 100644 bundles/CoffeeScriptBundle.tmbundle/Snippets/Range comprehension (exclusive).tmSnippet
 delete mode 100644 bundles/CoffeeScriptBundle.tmbundle/Snippets/Range comprehension (inclusive).tmSnippet
 delete mode 100644 bundles/CoffeeScriptBundle.tmbundle/Snippets/Raw javascript.tmSnippet
 delete mode 100644 bundles/CoffeeScriptBundle.tmbundle/Snippets/Switch.tmSnippet
 delete mode 100644 bundles/CoffeeScriptBundle.tmbundle/Snippets/Ternary If.tmSnippet
 delete mode 100644 bundles/CoffeeScriptBundle.tmbundle/Snippets/Try __ Catch.tmSnippet
 delete mode 100644 bundles/CoffeeScriptBundle.tmbundle/Snippets/Unless.tmSnippet
 delete mode 100644 bundles/CoffeeScriptBundle.tmbundle/Snippets/h1.tmSnippet
 delete mode 100644 bundles/CoffeeScriptBundle.tmbundle/Snippets/h2.tmSnippet
 delete mode 100644 bundles/CoffeeScriptBundle.tmbundle/Snippets/h3.tmSnippet
 delete mode 100644 bundles/CoffeeScriptBundle.tmbundle/Snippets/log.tmSnippet
 delete mode 100644 bundles/CoffeeScriptBundle.tmbundle/Snippets/require.tmSnippet
 delete mode 100644 bundles/CoffeeScriptBundle.tmbundle/Syntaxes/CoffeeScript.tmLanguage
 delete mode 100644 bundles/CoffeeScriptBundle.tmbundle/info.plist
 create mode 100644 bundles/Readme.md
 delete mode 100644 bundles/css.tmbundle/Commands/CodeCompletion CSS 2.tmCommand
 delete mode 100644 bundles/css.tmbundle/Commands/CodeCompletion CSS Property Values.tmCommand
 delete mode 100644 bundles/css.tmbundle/Commands/CodeCompletion CSS.tmCommand
 delete mode 100644 bundles/css.tmbundle/Commands/Documentation for Property.plist
 delete mode 100644 bundles/css.tmbundle/Commands/Insert Color.plist
 delete mode 100644 bundles/css.tmbundle/Commands/Preview.plist
 delete mode 100644 bundles/css.tmbundle/Commands/Validate Selected CSS.plist
 delete mode 100644 bundles/css.tmbundle/DragCommands/Insert Image URL.tmDragCommand
 delete mode 100644 bundles/css.tmbundle/Macros/Format CSS Compressed.tmMacro
 delete mode 100644 bundles/css.tmbundle/Macros/Format CSS.tmMacro
 delete mode 100644 bundles/css.tmbundle/Preferences/Comments.tmPreferences
 delete mode 100644 bundles/css.tmbundle/Preferences/Completions.tmPreferences
 delete mode 100644 bundles/css.tmbundle/Preferences/Folding.tmPreferences
 delete mode 100644 bundles/css.tmbundle/Preferences/Miscellaneous.tmPreferences
 delete mode 100644 bundles/css.tmbundle/Preferences/Property Completions.tmPreferences
 delete mode 100644 bundles/css.tmbundle/Preferences/Property Value Completions.tmPreferences
 delete mode 100644 bundles/css.tmbundle/Preferences/PropertyName.tmPreferences
 delete mode 100644 bundles/css.tmbundle/Preferences/Symbol List: Group.tmPreferences
 delete mode 100644 bundles/css.tmbundle/Preferences/Symbol list.tmPreferences
 delete mode 100644 bundles/css.tmbundle/README.mdown
 delete mode 100644 bundles/css.tmbundle/Snippets/!important CSS (!).plist
 delete mode 100644 bundles/css.tmbundle/Snippets/Fixed Position Bottom 100% wide IE6.tmSnippet
 delete mode 100644 bundles/css.tmbundle/Snippets/background-attachment: scroll:fixed (background).plist
 delete mode 100644 bundles/css.tmbundle/Snippets/background-color:  color-hex (background).plist
 delete mode 100644 bundles/css.tmbundle/Snippets/background-color:  color-name (background).plist
 delete mode 100644 bundles/css.tmbundle/Snippets/background-color:  color-rgb (background).plist
 delete mode 100644 bundles/css.tmbundle/Snippets/background-color:  transparent (background).plist
 delete mode 100644 bundles/css.tmbundle/Snippets/background-image:  none (background).plist
 delete mode 100644 bundles/css.tmbundle/Snippets/background-image:  url (background).plist
 delete mode 100644 bundles/css.tmbundle/Snippets/background-position:  position (background).plist
 delete mode 100644 bundles/css.tmbundle/Snippets/background-repeat:  r:r-x:r-y:n-r (background).plist
 delete mode 100644 bundles/css.tmbundle/Snippets/background:  color image repeat attachment position (background).plist
 delete mode 100644 bundles/css.tmbundle/Snippets/border-bottom-color: size style color (border).plist
 delete mode 100644 bundles/css.tmbundle/Snippets/border-bottom-style: size style color (border).plist
 delete mode 100644 bundles/css.tmbundle/Snippets/border-bottom-width: size style color (border).plist
 delete mode 100644 bundles/css.tmbundle/Snippets/border-bottom: size style color (border).plist
 delete mode 100644 bundles/css.tmbundle/Snippets/border-color: color (border).plist
 delete mode 100644 bundles/css.tmbundle/Snippets/border-left-color: color (border).plist
 delete mode 100644 bundles/css.tmbundle/Snippets/border-left-style: style (border).plist
 delete mode 100644 bundles/css.tmbundle/Snippets/border-left-width: size (border).plist
 delete mode 100644 bundles/css.tmbundle/Snippets/border-left: size style color (border).plist
 delete mode 100644 bundles/css.tmbundle/Snippets/border-right-color: color (border).plist
 delete mode 100644 bundles/css.tmbundle/Snippets/border-right-style: style (border).plist
 delete mode 100644 bundles/css.tmbundle/Snippets/border-right-width: size (border).plist
 delete mode 100644 bundles/css.tmbundle/Snippets/border-right: size style color (border).plist
 delete mode 100644 bundles/css.tmbundle/Snippets/border-style: style (border).plist
 delete mode 100644 bundles/css.tmbundle/Snippets/border-top-color: color (border).plist
 delete mode 100644 bundles/css.tmbundle/Snippets/border-top-style: style (border).plist
 delete mode 100644 bundles/css.tmbundle/Snippets/border-top-width: size (border).plist
 delete mode 100644 bundles/css.tmbundle/Snippets/border-top: size style color (border).plist
 delete mode 100644 bundles/css.tmbundle/Snippets/border-width: width (border).plist
 delete mode 100644 bundles/css.tmbundle/Snippets/border:   size style color (border).plist
 delete mode 100644 bundles/css.tmbundle/Snippets/clear: value (clear).plist
 delete mode 100644 bundles/css.tmbundle/Snippets/color:  color-hex (color).plist
 delete mode 100644 bundles/css.tmbundle/Snippets/color:  color-name (color).plist
 delete mode 100644 bundles/css.tmbundle/Snippets/color:  color-rgb (color).plist
 delete mode 100644 bundles/css.tmbundle/Snippets/cursor: type (cursor).plist
 delete mode 100644 bundles/css.tmbundle/Snippets/cursor: url (cursor).plist
 delete mode 100644 bundles/css.tmbundle/Snippets/direction: ltr|rtl (direction).plist
 delete mode 100644 bundles/css.tmbundle/Snippets/display: block (display).plist
 delete mode 100644 bundles/css.tmbundle/Snippets/display: common-types (display).plist
 delete mode 100644 bundles/css.tmbundle/Snippets/display: inline (display).plist
 delete mode 100644 bundles/css.tmbundle/Snippets/display: table-types (display).plist
 delete mode 100644 bundles/css.tmbundle/Snippets/filter: AlphaImageLoader [for IE PNGs] (background).plist
 delete mode 100644 bundles/css.tmbundle/Snippets/float: left:right:none (float).plist
 delete mode 100644 bundles/css.tmbundle/Snippets/font-family:   family (font).plist
 delete mode 100644 bundles/css.tmbundle/Snippets/font-size: size (font).plist
 delete mode 100644 bundles/css.tmbundle/Snippets/font-style:   normal:italic:oblique (font).plist
 delete mode 100644 bundles/css.tmbundle/Snippets/font-variant:   normal:small-caps (font).plist
 delete mode 100644 bundles/css.tmbundle/Snippets/font-weight: weight (font).plist
 delete mode 100644 bundles/css.tmbundle/Snippets/font:   style variant weight size:line-height font -family (font).plist
 delete mode 100644 bundles/css.tmbundle/Snippets/font: size font (font).plist
 delete mode 100644 bundles/css.tmbundle/Snippets/letter-spacing:   length-em (letter).plist
 delete mode 100644 bundles/css.tmbundle/Snippets/letter-spacing:   length-px (letter).plist
 delete mode 100644 bundles/css.tmbundle/Snippets/list-style-image: url (list).plist
 delete mode 100644 bundles/css.tmbundle/Snippets/list-style-position: pos (list).plist
 delete mode 100644 bundles/css.tmbundle/Snippets/list-style-type: asian (list).plist
 delete mode 100644 bundles/css.tmbundle/Snippets/list-style-type: marker(list).plist
 delete mode 100644 bundles/css.tmbundle/Snippets/list-style-type: numeric (list).plist
 delete mode 100644 bundles/css.tmbundle/Snippets/list-style-type: other (list).plist
 delete mode 100644 bundles/css.tmbundle/Snippets/list-style-type: roman-alpha-greek (list).plist
 delete mode 100644 bundles/css.tmbundle/Snippets/list-style: type position image (list).plist
 delete mode 100644 bundles/css.tmbundle/Snippets/margin-bottom: length (margin).plist
 delete mode 100644 bundles/css.tmbundle/Snippets/margin-left: length (margin).plist
 delete mode 100644 bundles/css.tmbundle/Snippets/margin-right: length (margin).plist
 delete mode 100644 bundles/css.tmbundle/Snippets/margin-top: length (margin).plist
 delete mode 100644 bundles/css.tmbundle/Snippets/margin:   all (margin).plist
 delete mode 100644 bundles/css.tmbundle/Snippets/margin: T R B L (margin).plist
 delete mode 100644 bundles/css.tmbundle/Snippets/margin: V H (margin).plist
 delete mode 100644 bundles/css.tmbundle/Snippets/marker-offset: auto (marker).plist
 delete mode 100644 bundles/css.tmbundle/Snippets/marker-offset: length (marker).plist
 delete mode 100644 bundles/css.tmbundle/Snippets/opacity: [for Safari, FF and IE] (opacity).plist
 delete mode 100644 bundles/css.tmbundle/Snippets/overflow: type (overflow).plist
 delete mode 100644 bundles/css.tmbundle/Snippets/padding-bottom: length (margin).plist
 delete mode 100644 bundles/css.tmbundle/Snippets/padding-left: length (margin).plist
 delete mode 100644 bundles/css.tmbundle/Snippets/padding-right: length (margin).plist
 delete mode 100644 bundles/css.tmbundle/Snippets/padding-top: length (margin).plist
 delete mode 100644 bundles/css.tmbundle/Snippets/padding:   T R B L (padding).plist
 delete mode 100644 bundles/css.tmbundle/Snippets/padding:   V H (padding).plist
 delete mode 100644 bundles/css.tmbundle/Snippets/padding:   all (padding).plist
 delete mode 100644 bundles/css.tmbundle/Snippets/position: type (position).plist
 delete mode 100644 bundles/css.tmbundle/Snippets/properties { } ( } ).plist
 delete mode 100644 bundles/css.tmbundle/Snippets/scrollbar.tmSnippet
 delete mode 100644 bundles/css.tmbundle/Snippets/selection.tmSnippet
 delete mode 100644 bundles/css.tmbundle/Snippets/text-align: left:center:right (txt).plist
 delete mode 100644 bundles/css.tmbundle/Snippets/text-decoration: none:underline:overline:line-through:blink (text).plist
 delete mode 100644 bundles/css.tmbundle/Snippets/text-indent: length (text).plist
 delete mode 100644 bundles/css.tmbundle/Snippets/text-shadow: color-hex x y blur (text).plist
 delete mode 100644 bundles/css.tmbundle/Snippets/text-shadow: color-rgb x y blur (text).plist
 delete mode 100644 bundles/css.tmbundle/Snippets/text-shadow: none (text).plist
 delete mode 100644 bundles/css.tmbundle/Snippets/text-transform: capitalize:upper:lower (text).plist
 delete mode 100644 bundles/css.tmbundle/Snippets/text-transform: none (text).plist
 delete mode 100644 bundles/css.tmbundle/Snippets/vertical-align: type (vertical).plist
 delete mode 100644 bundles/css.tmbundle/Snippets/visibility: type (visibility).plist
 delete mode 100644 bundles/css.tmbundle/Snippets/white-space:  normal:pre:nowrap (white).plist
 delete mode 100644 bundles/css.tmbundle/Snippets/word-spacing:  length (word).plist
 delete mode 100644 bundles/css.tmbundle/Snippets/word-spacing:  normal (word).plist
 delete mode 100644 bundles/css.tmbundle/Snippets/z-index: index (z).plist
 delete mode 100644 bundles/css.tmbundle/Syntaxes/CSS.plist
 delete mode 100644 bundles/css.tmbundle/Tests/tests.css
 delete mode 100644 bundles/css.tmbundle/info.plist
 delete mode 100644 bundles/html.tmbundle/Commands/About Persistent Includes.tmCommand
 delete mode 100644 bundles/html.tmbundle/Commands/CodeCompletion HTML Attributes.tmCommand
 delete mode 100644 bundles/html.tmbundle/Commands/CodeCompletion HTML Tags.tmCommand
 delete mode 100644 bundles/html.tmbundle/Commands/Convert Line : Selection to URL Escapes.plist
 delete mode 100644 bundles/html.tmbundle/Commands/Convert to HTML Entities.plist
 delete mode 100644 bundles/html.tmbundle/Commands/Convert to named entities excl tags.plist
 delete mode 100644 bundles/html.tmbundle/Commands/Decode HTML Entities.plist
 delete mode 100644 bundles/html.tmbundle/Commands/Decode Numeric URL Escapes in Line : Selection.plist
 delete mode 100644 bundles/html.tmbundle/Commands/Documentation for Tag.plist
 delete mode 100644 bundles/html.tmbundle/Commands/Encrypt Line : Selection (ROT 13).tmCommand
 delete mode 100644 bundles/html.tmbundle/Commands/Insert Close Tag.plist
 delete mode 100644 bundles/html.tmbundle/Commands/Insert Entity….plist
 delete mode 100644 bundles/html.tmbundle/Commands/Insert Tag Pair.plist
 delete mode 100644 bundles/html.tmbundle/Commands/Persistent Include.tmCommand
 delete mode 100644 bundles/html.tmbundle/Commands/Preview in All Active Browsers.plist
 delete mode 100644 bundles/html.tmbundle/Commands/Refresh All Active Browsers.plist
 delete mode 100644 bundles/html.tmbundle/Commands/Show Web Preview.tmCommand
 delete mode 100644 bundles/html.tmbundle/Commands/Strip HTML tags.plist
 delete mode 100644 bundles/html.tmbundle/Commands/Tidy.plist
 delete mode 100644 bundles/html.tmbundle/Commands/Update Includes.tmCommand
 delete mode 100644 bundles/html.tmbundle/Commands/Update Project.tmCommand
 delete mode 100644 bundles/html.tmbundle/Commands/W3C validation.plist
 delete mode 100644 bundles/html.tmbundle/Commands/Wrap Each Selected Line in Open:Close Tag.plist
 delete mode 100644 bundles/html.tmbundle/DragCommands/Anchor Tag.plist
 delete mode 100644 bundles/html.tmbundle/DragCommands/CSS Link.plist
 delete mode 100644 bundles/html.tmbundle/DragCommands/Image Tag.plist
 delete mode 100644 bundles/html.tmbundle/DragCommands/Insert Anchor href 2.tmDragCommand
 delete mode 100644 bundles/html.tmbundle/DragCommands/Insert Anchor href.tmDragCommand
 delete mode 100644 bundles/html.tmbundle/DragCommands/Insert Flash Movie (Swf).tmDragCommand
 delete mode 100644 bundles/html.tmbundle/DragCommands/Insert JS Link.tmDragCommand
 delete mode 100644 bundles/html.tmbundle/DragCommands/Insert QuickTime Movie.tmDragCommand
 delete mode 100644 bundles/html.tmbundle/DragCommands/Insert URL.tmDragCommand
 delete mode 100644 bundles/html.tmbundle/Macros/Delete whitespace between tags.plist
 delete mode 100644 bundles/html.tmbundle/Preferences/Comments.plist
 delete mode 100644 bundles/html.tmbundle/Preferences/Completions HTML Attributes.tmPreferences
 delete mode 100644 bundles/html.tmbundle/Preferences/Empty tag typing pairs.plist
 delete mode 100644 bundles/html.tmbundle/Preferences/Folding.tmPreferences
 delete mode 100644 bundles/html.tmbundle/Preferences/Indent Corrections.tmPreferences
 delete mode 100644 bundles/html.tmbundle/Preferences/Miscellaneous.plist
 delete mode 100644 bundles/html.tmbundle/Preferences/Symbol List: ID.plist
 delete mode 100644 bundles/html.tmbundle/Preferences/Tag Completions.tmPreferences
 delete mode 100644 bundles/html.tmbundle/Preferences/Tag preferences.plist
 delete mode 100644 bundles/html.tmbundle/README.mdown
 delete mode 100644 bundles/html.tmbundle/Snippets/Arrow (arrow).plist
 delete mode 100644 bundles/html.tmbundle/Snippets/Backspace (backspace).plist
 delete mode 100644 bundles/html.tmbundle/Snippets/Backtab (backtab).plist
 delete mode 100644 bundles/html.tmbundle/Snippets/Command (command).plist
 delete mode 100644 bundles/html.tmbundle/Snippets/Control (control).plist
 delete mode 100644 bundles/html.tmbundle/Snippets/Delete (delete).plist
 delete mode 100644 bundles/html.tmbundle/Snippets/DocType HTML 4.0 Strict.plist
 delete mode 100644 bundles/html.tmbundle/Snippets/DocType HTML 5.plist
 delete mode 100644 bundles/html.tmbundle/Snippets/DocType XHTL 1.0 Frameset.plist
 delete mode 100644 bundles/html.tmbundle/Snippets/DocType XHTML 1.0 Strict.plist
 delete mode 100644 bundles/html.tmbundle/Snippets/DocType XHTML 1.0 Transitional.plist
 delete mode 100644 bundles/html.tmbundle/Snippets/DocType XHTML 1.1.plist
 delete mode 100644 bundles/html.tmbundle/Snippets/Down (down).plist
 delete mode 100644 bundles/html.tmbundle/Snippets/Embed QT movie (movie).plist
 delete mode 100644 bundles/html.tmbundle/Snippets/Emphasize.tmSnippet
 delete mode 100644 bundles/html.tmbundle/Snippets/Enter (enter).plist
 delete mode 100644 bundles/html.tmbundle/Snippets/Escape (escape).plist
 delete mode 100644 bundles/html.tmbundle/Snippets/Fieldset.tmSnippet
 delete mode 100644 bundles/html.tmbundle/Snippets/HTML — 4.0 Transitional (doctype).plist
 delete mode 100644 bundles/html.tmbundle/Snippets/IE Conditional Comment: Internet Explorer 5_0 only.tmSnippet
 delete mode 100644 bundles/html.tmbundle/Snippets/IE Conditional Comment: Internet Explorer 5_5 only.tmSnippet
 delete mode 100644 bundles/html.tmbundle/Snippets/IE Conditional Comment: Internet Explorer 5_x.tmSnippet
 delete mode 100644 bundles/html.tmbundle/Snippets/IE Conditional Comment: Internet Explorer 6 and below.tmSnippet
 delete mode 100644 bundles/html.tmbundle/Snippets/IE Conditional Comment: Internet Explorer 6 only.tmSnippet
 delete mode 100644 bundles/html.tmbundle/Snippets/IE Conditional Comment: Internet Explorer 7+.tmSnippet
 delete mode 100644 bundles/html.tmbundle/Snippets/IE Conditional Comment: Internet Explorer.tmSnippet
 delete mode 100644 bundles/html.tmbundle/Snippets/IE Conditional Comment: NOT Internet Explorer.tmSnippet
 delete mode 100644 bundles/html.tmbundle/Snippets/Input with Label.tmSnippet
 delete mode 100644 bundles/html.tmbundle/Snippets/Left (left).plist
 delete mode 100644 bundles/html.tmbundle/Snippets/Option (option).plist
 delete mode 100644 bundles/html.tmbundle/Snippets/Option.tmSnippet
 delete mode 100644 bundles/html.tmbundle/Snippets/Return (return).plist
 delete mode 100644 bundles/html.tmbundle/Snippets/Right (right).plist
 delete mode 100644 bundles/html.tmbundle/Snippets/Select Box.tmSnippet
 delete mode 100644 bundles/html.tmbundle/Snippets/Shift (shift).plist
 delete mode 100644 bundles/html.tmbundle/Snippets/Smart return:indent for tag pairs.plist
 delete mode 100644 bundles/html.tmbundle/Snippets/Strong.tmSnippet
 delete mode 100644 bundles/html.tmbundle/Snippets/Tab (tab).plist
 delete mode 100644 bundles/html.tmbundle/Snippets/Up (up).plist
 delete mode 100644 bundles/html.tmbundle/Snippets/Wrap Selection In Tag.plist
 delete mode 100644 bundles/html.tmbundle/Snippets/Wrap in <?= … ?>.plist
 delete mode 100644 bundles/html.tmbundle/Snippets/XHTML   <input>.plist
 delete mode 100644 bundles/html.tmbundle/Snippets/XHTML   <textarea>.plist
 delete mode 100644 bundles/html.tmbundle/Snippets/XHTML &nbsp; NonBreakingSpace.plist
 delete mode 100644 bundles/html.tmbundle/Snippets/XHTML <a mailto: >.plist
 delete mode 100644 bundles/html.tmbundle/Snippets/XHTML <base>.plist
 delete mode 100644 bundles/html.tmbundle/Snippets/XHTML <body>.plist
 delete mode 100644 bundles/html.tmbundle/Snippets/XHTML <br :>.plist
 delete mode 100644 bundles/html.tmbundle/Snippets/XHTML <div>.plist
 delete mode 100644 bundles/html.tmbundle/Snippets/XHTML <form>.plist
 delete mode 100644 bundles/html.tmbundle/Snippets/XHTML <h1>.plist
 delete mode 100644 bundles/html.tmbundle/Snippets/XHTML <head>.plist
 delete mode 100644 bundles/html.tmbundle/Snippets/XHTML <link>.plist
 delete mode 100644 bundles/html.tmbundle/Snippets/XHTML <meta>.plist
 delete mode 100644 bundles/html.tmbundle/Snippets/XHTML <script src...>.plist
 delete mode 100644 bundles/html.tmbundle/Snippets/XHTML <script>.plist
 delete mode 100644 bundles/html.tmbundle/Snippets/XHTML <style>.plist
 delete mode 100644 bundles/html.tmbundle/Snippets/XHTML <table>.plist
 delete mode 100644 bundles/html.tmbundle/Snippets/XHTML <title>.plist
 delete mode 100644 bundles/html.tmbundle/Support/entities.txt
 delete mode 100644 bundles/html.tmbundle/Support/nibs/Insert Entity.nib/classes.nib
 delete mode 100644 bundles/html.tmbundle/Support/nibs/Insert Entity.nib/info.nib
 delete mode 100644 bundles/html.tmbundle/Support/nibs/Insert Entity.nib/keyedobjects.nib
 delete mode 100644 bundles/html.tmbundle/Support/tminclude.rb
 delete mode 100644 bundles/html.tmbundle/Syntaxes/HTML.plist
 delete mode 100644 bundles/html.tmbundle/Templates/HTML – 4.0 Strict/index.html
 delete mode 100644 bundles/html.tmbundle/Templates/HTML – 4.0 Strict/info.plist
 delete mode 100644 bundles/html.tmbundle/Templates/HTML — 4.0 Transitional/index.html
 delete mode 100644 bundles/html.tmbundle/Templates/HTML — 4.0 Transitional/info.plist
 delete mode 100644 bundles/html.tmbundle/Templates/XHTML – 1.0 Frameset/index.html
 delete mode 100644 bundles/html.tmbundle/Templates/XHTML – 1.0 Frameset/info.plist
 delete mode 100644 bundles/html.tmbundle/Templates/XHTML – 1.0 Strict/index.html
 delete mode 100644 bundles/html.tmbundle/Templates/XHTML – 1.0 Strict/info.plist
 delete mode 100644 bundles/html.tmbundle/Templates/XHTML – 1.0 Transitional/index.html
 delete mode 100644 bundles/html.tmbundle/Templates/XHTML – 1.0 Transitional/info.plist
 delete mode 100644 bundles/html.tmbundle/Templates/XHTML – 1.1/index.html
 delete mode 100644 bundles/html.tmbundle/Templates/XHTML – 1.1/info.plist
 delete mode 100644 bundles/html.tmbundle/info.plist
 delete mode 100644 bundles/javascript.tmbundle/Commands/Copy as Bookmarklet to Clipboard.tmCommand
 delete mode 100644 bundles/javascript.tmbundle/Commands/Documentation for Word.plist
 delete mode 100644 bundles/javascript.tmbundle/Commands/New Function.tmCommand
 delete mode 100644 bundles/javascript.tmbundle/Commands/New Method.tmCommand
 delete mode 100644 bundles/javascript.tmbundle/Commands/Reformat Document : Selection.tmCommand
 delete mode 100644 bundles/javascript.tmbundle/Preferences/Comments.tmPreferences
 delete mode 100644 bundles/javascript.tmbundle/Preferences/JavaScript Indent.tmPreferences
 delete mode 100644 bundles/javascript.tmbundle/Preferences/Symbol List Banned.tmPreferences
 delete mode 100644 bundles/javascript.tmbundle/Preferences/Symbol List Class.tmPreferences
 delete mode 100644 bundles/javascript.tmbundle/Preferences/Symbol List Instance.tmPreferences
 delete mode 100644 bundles/javascript.tmbundle/Preferences/Symbol List Sub 1.tmPreferences
 delete mode 100644 bundles/javascript.tmbundle/Preferences/Symbol List Sub 2.tmPreferences
 delete mode 100644 bundles/javascript.tmbundle/Snippets/Get Elements.tmSnippet
 delete mode 100644 bundles/javascript.tmbundle/Snippets/Object Method String.tmSnippet
 delete mode 100644 bundles/javascript.tmbundle/Snippets/Object Method.tmSnippet
 delete mode 100644 bundles/javascript.tmbundle/Snippets/Object Value JS.tmSnippet
 delete mode 100644 "bundles/javascript.tmbundle/Snippets/Object key — key: \"value\".tmSnippet"
 delete mode 100644 bundles/javascript.tmbundle/Snippets/Prototype (proto).plist
 delete mode 100644 bundles/javascript.tmbundle/Snippets/for (…) {…} (faster).tmSnippet
 delete mode 100644 bundles/javascript.tmbundle/Snippets/for (…) {…}.tmSnippet
 delete mode 100644 bundles/javascript.tmbundle/Snippets/function (fun).plist
 delete mode 100644 bundles/javascript.tmbundle/Snippets/function.tmSnippet
 delete mode 100644 bundles/javascript.tmbundle/Snippets/if ___ else.tmSnippet
 delete mode 100644 bundles/javascript.tmbundle/Snippets/if.tmSnippet
 delete mode 100644 bundles/javascript.tmbundle/Snippets/setTimeout function.tmSnippet
 delete mode 100644 bundles/javascript.tmbundle/Support/dev_guru_index.gz
 delete mode 100755 bundles/javascript.tmbundle/Support/lib/jsbeautifier-license.txt
 delete mode 100755 bundles/javascript.tmbundle/Support/lib/jsbeautifier.py
 delete mode 100644 bundles/javascript.tmbundle/Syntaxes/JavaScript.plist
 delete mode 100644 bundles/javascript.tmbundle/info.plist
 delete mode 100755 bundles/less.tmbundle/Commands/Save to CSS.tmCommand
 delete mode 100755 bundles/less.tmbundle/README.md
 delete mode 100755 bundles/less.tmbundle/Syntaxes/LESS.tmLanguage
 delete mode 100755 bundles/less.tmbundle/info.plist
 delete mode 100755 bundles/less.tmbundle/sample.less
 delete mode 100755 bundles/less.tmbundle/sample.png
 delete mode 100644 bundles/ruby-on-rails.tmbundle/.gitignore
 delete mode 100644 bundles/ruby-on-rails.tmbundle/ABOUT
 delete mode 100644 bundles/ruby-on-rails.tmbundle/CHANGELOG
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Capfile
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Commands/Autocomplete Foreign Key Fixture Reference (habtm).tmCommand
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Commands/Autocomplete Foreign Key Fixture Reference.tmCommand
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Commands/Clone Development DB to Test DB.tmCommand
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Commands/DB Schema Dump.plist
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Commands/DB Schema Import.plist
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Commands/Generate Quick Migration.tmCommand
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Commands/Generate.plist
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Commands/Go To Alternate File.plist
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Commands/Go To File on This Line.plist
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Commands/Go To File.plist
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Commands/Go To Functional Test.plist
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Commands/Go To Helper.plist
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Commands/Go To Javascript.plist
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Commands/Go To Model.tmCommand
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Commands/Go To Stylesheet.plist
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Commands/Go To Unit Test.plist
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Commands/Go To View.plist
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Commands/Go to Fixture.tmCommand
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Commands/Install Bundled Plugin.plist
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Commands/Load Fixtures (Test DB).tmCommand
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Commands/Load Fixtures.tmCommand
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Commands/Make Selection in to Partial.plist
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Commands/Migrate to Previous Version.tmCommand
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Commands/Rake Migrate to Version.tmCommand
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Commands/Rake Migrate.plist
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Commands/Redo Last Migration.tmCommand
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Commands/Show DB Schema.tmCommand
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Commands/Test All.tmCommand
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Commands/Test Functionals.tmCommand
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Commands/Test Integration.tmCommand
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Commands/Test Plugins.tmCommand
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Commands/Test Recent.tmCommand
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Commands/Test Uncommitted.tmCommand
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Commands/Test Units.tmCommand
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Commands/View demo help.tmCommand
 delete mode 100644 bundles/ruby-on-rails.tmbundle/DragCommands/Require Rails File.tmDragCommand
 delete mode 100644 bundles/ruby-on-rails.tmbundle/LICENSE
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Macros/Add %3A Remove Column.tmMacro
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Macros/Add %3A Remove Index.tmMacro
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Macros/Add %3A Remove Named Index.tmMacro
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Macros/Add %3A Remove Several Columns (marcc).tmMacro
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Macros/Add %3A Remove Several Columns.tmMacro
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Macros/Add %3A Remove Unique Index.tmMacro
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Macros/Change : Change Table.tmMacro
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Macros/Create %3A Drop Table.tmMacro
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Macros/Drop %3A Create Table.tmMacro
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Macros/Remove %3A Add Column.tmMacro
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Macros/Rename %3A Rename Several Columns (mncc).tmMacro
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Macros/Rename %3A Rename Several Columns.tmMacro
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Macros/Rename Column.tmMacro
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Macros/Rename Table.tmMacro
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Preferences/Template (ERB).tmPreferences
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Preferences/Template (Haml).tmPreferences
 delete mode 100644 bundles/ruby-on-rails.tmbundle/README
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Rakefile
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/$LABEL.tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/%3C%= Fixtures_identify(%3Asymbol) %%3E.tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/180 rails form_tag.plist
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/Create binary column.tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/Create boolean column.tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/Create controller class.tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/Create date column.tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/Create datetime column.tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/Create decimal column.tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/Create float column.tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/Create functional test class.tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/Create integer column.tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/Create lock_version column.tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/Create references column.tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/Create string column.tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/Create text column.tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/Create time column.tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/Create timestamp column.tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/Create timestamps columns.tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/Migration Create Column (mcc).plist
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/Migration Create Column Continue (mccc).plist
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/Migration Drop Create Table (mdct).plist
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/Migration Remove and Add Column (mrac).plist
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/RAILS_DEFAULT_LOGGER.debug (rdb).plist
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/Table column(s) rename.tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/Test Assert Redirected To (art).plist
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/Test Assert Response (are).plist
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/after_create.tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/after_destroy.tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/after_save.tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/after_update.tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/after_validation.tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/after_validation_on_create.tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/after_validation_on_update.tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/assert(var = assigns(%3Avar)).tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/assert_difference.tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/assert_no_difference.tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/assert_redirected_to (nested path plural).tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/assert_redirected_to (nested path).tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/assert_redirected_to (path plural).tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/assert_redirected_to (path).tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/assert_rjs.tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/assert_select.tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/before_create.tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/before_destroy.tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/before_save.tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/before_update.tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/before_validation.tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/before_validation_on_create.tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/before_validation_on_update.tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/belongs_to (bt).plist
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/cattr_accessor.tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/def create - resource.tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/def get request.tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/def post request.tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/end.tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/find(%3Aall).tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/find(%3Afirst).tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/find(id).tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/for loop erb.tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/form_for check_box.tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/form_for checkbox.tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/form_for file_field 2.tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/form_for file_field.tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/form_for hidden_field 2.tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/form_for hidden_field.tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/form_for label 2.tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/form_for label.tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/form_for password_field 2.tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/form_for password_field.tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/form_for radio_box 2.tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/form_for radio_box.tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/form_for submit 2.tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/form_for submit.tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/form_for text_area 2.tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/form_for text_area.tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/form_for text_field 2.tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/form_for text_field.tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/form_for with errors.tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/form_for.tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/has_and_belongs_to_many (habtm).plist
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/has_many (hm).plist
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/has_many (through).tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/has_many :dependent => :destroy.tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/has_one (ho).plist
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/image_submit_tag.tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/javascript_include_tag.tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/lia.plist
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/liai.plist
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/lic.plist
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/lica.plist
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/licai.plist
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/link_to (nested path plural).tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/link_to (nested path).tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/link_to (path plural).tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/link_to (path).tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/link_to model.tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/logger_debug.tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/logger_error.tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/logger_fatal.tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/logger_info.tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/logger_warn.tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/map(&%3Asym_proc).tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/map_catch_all.tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/map_named_route.tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/map_resource.tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/map_resources.tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/map_with_options.tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/mattr_accessor.tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/named_scope lambda.tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/named_scope.tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/page_hide (%2Aids).tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/page_insert_html (position, id, partial).tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/page_replace (id, partial).tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/page_replace_html (id, partial).tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/page_show (%2Aids).tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/page_toggle (%2Aids).tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/page_visual_effect (effect, id).tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/rails flash.plist
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/rails params.plist
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/rails session.plist
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/rea.plist
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/reai.plist
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/rec.plist
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/reca.plist
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/recai.plist
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/redirect_to (nested path plural).tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/redirect_to (nested path).tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/redirect_to (path plural).tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/redirect_to (path).tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/render (action)... (ra).plist
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/render (action,layout) (ral).plist
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/render (file) (rf).plist
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/render (file,use_full_path) (rfu).plist
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/render (inline) (ri).plist
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/render (inline,locals) (ril).plist
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/render (inline,type) (rit).plist
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/render (layout) (rl).plist
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/render (nothing) (rn).plist
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/render (nothing,status) (rns).plist
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/render (partial) (rp).plist
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/render (partial,collection) (rpc).plist
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/render (partial,locals) (rpl).plist
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/render (partial,object) (rpo).plist
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/render (partial,status) (rps).plist
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/render (text) (rt).plist
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/render (text,layout) (rtl).plist
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/render (text,layout=%3Etrue) (rtlt).plist
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/render (text,status) (rts).plist
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/render (update).tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/respond_to (html).tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/respond_to.tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/returning do %7Cvariable%7C %E2%80%A6 end.tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/stylesheet_link_tag.tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/submit_tag.tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/t_binary (tcbi).tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/t_boolean (tcb).tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/t_date (tcda).tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/t_datetime (tcdt).tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/t_decimal (tcd).tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/t_float (tcf).tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/t_integer (tci).tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/t_lock_version (tcl).tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/t_references (tcr).tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/t_rename (tre).tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/t_string (tcs).tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/t_text (tct).tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/t_time (tcti).tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/t_timestamp (tcts).tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/t_timestamps (tctss).tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/validates_acceptance_of if.tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/validates_acceptance_of.tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/validates_associated (va).plist
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/validates_associated if (vaif).plist
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/validates_confirmation_of (vc).plist
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/validates_confirmation_of if (vcif).plist
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/validates_exclusion_of (ve).plist
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/validates_exclusion_of if (veif).plist
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/validates_format_of if.tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/validates_format_of.tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/validates_inclusion_of if.tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/validates_inclusion_of.tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/validates_length_of (vl).plist
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/validates_length_of if.tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/validates_numericality_of if.tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/validates_numericality_of.tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/validates_presence_of (vp).plist
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/validates_presence_of if (vpif) 2.plist
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/validates_uniqueness_of (vu).plist
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/validates_uniqueness_of if (vuif).plist
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/verify (verify).plist
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/verify - redirect (verify).plist
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/wants_format.tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/xhr delete.tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/xhr get.tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/xhr post.tmSnippet
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Snippets/xhr put.tmSnippet
 delete mode 100755 bundles/ruby-on-rails.tmbundle/Support/bin/create_partial_from_selection.rb
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Support/bin/fixture_auto_complete.rb
 delete mode 100755 bundles/ruby-on-rails.tmbundle/Support/bin/generate.rb
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Support/bin/generate_quick_migration.rb
 delete mode 100755 bundles/ruby-on-rails.tmbundle/Support/bin/go_to_alternate_file.rb
 delete mode 100755 bundles/ruby-on-rails.tmbundle/Support/bin/go_to_file_on_current_line.rb
 delete mode 100755 bundles/ruby-on-rails.tmbundle/Support/bin/insert_add_column_or_create_table.rb
 delete mode 100755 bundles/ruby-on-rails.tmbundle/Support/bin/intelligent_migration_snippet.rb
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Support/bin/list_plugins.rb
 delete mode 100755 bundles/ruby-on-rails.tmbundle/Support/bin/rake_helper.rb
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Support/bin/show_schema.rb
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Support/images/home.gif
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Support/images/install.gif
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Support/images/rails.png
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Support/images/svn.png
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Support/javascripts/prototype.js
 delete mode 100755 bundles/ruby-on-rails.tmbundle/Support/lib/rails/buffer.rb
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Support/lib/rails/command_go_to_file.rb
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Support/lib/rails/generate.rb
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Support/lib/rails/inflections.rb
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Support/lib/rails/inflector.rb
 delete mode 100755 bundles/ruby-on-rails.tmbundle/Support/lib/rails/misc.rb
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Support/lib/rails/rails_path.rb
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Support/lib/rails/text_mate.rb
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Support/lib/rails/unobtrusive_logger.rb
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Support/lib/rails_bundle_tools.rb
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Support/plugins/footnotes-edge/init.rb
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Support/plugins/footnotes-edge/lib/textmate_backtracer.rb
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Support/plugins/footnotes-edge/lib/textmate_footnotes.rb
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Support/plugins/footnotes-edge/lib/textmate_initialize.rb
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Support/plugins/footnotes-edge/templates/rescues/template_error.erb
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Support/plugins/footnotes-edge/test/mock_controller.rb
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Support/plugins/footnotes-edge/test/textmate_footnotes_test.rb
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Support/plugins/footnotes/init.rb
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Support/plugins/footnotes/lib/textmate_backtracer.rb
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Support/plugins/footnotes/lib/textmate_footnotes.rb
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Support/plugins/footnotes/lib/textmate_initialize.rb
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Support/plugins/footnotes/templates/rescues/template_error.rhtml
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Support/plugins/footnotes/test/mock_controller.rb
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Support/plugins/footnotes/test/textmate_footnotes_test.rb
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Support/templates/list_plugins.rhtml
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Support/test/app_fixtures/app/controllers/admin/base_controller.rb
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Support/test/app_fixtures/app/controllers/posts_controller.rb
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Support/test/app_fixtures/app/controllers/user_controller.rb
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Support/test/app_fixtures/app/controllers/users_controller.rb
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Support/test/app_fixtures/app/helpers/user_helper.rb
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Support/test/app_fixtures/app/models/notifier.rb
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Support/test/app_fixtures/app/models/person.rb
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Support/test/app_fixtures/app/models/user.rb
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Support/test/app_fixtures/app/views/admin/base/action.html.erb
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Support/test/app_fixtures/app/views/notifier/forgot_password.html.erb
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Support/test/app_fixtures/app/views/user/new.rhtml
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Support/test/app_fixtures/app/views/users/create.html.erb
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Support/test/app_fixtures/app/views/users/existing_views.html.erb
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Support/test/app_fixtures/app/views/users/existing_views.js.rjs
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Support/test/app_fixtures/app/views/users/existing_views.wacky.erb
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Support/test/app_fixtures/app/views/users/existing_views.xml.builder
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Support/test/app_fixtures/app/views/users/new.html.erb
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Support/test/app_fixtures/config/boot.rb
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Support/test/app_fixtures/config/environment.rb
 delete mode 100755 bundles/ruby-on-rails.tmbundle/Support/test/app_fixtures/script/generate
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Support/test/fixtures/app/controllers/posts_controller.rb
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Support/test/fixtures/vendor/plugins/haml/init.rb
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Support/test/test_buffer.rb
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Support/test/test_generator.rb
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Support/test/test_helper.rb
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Support/test/test_rails_path.rb
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Support/test/test_text_mate.rb
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Support/test/text_mate_mock.rb
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Syntaxes/HTML (Rails).plist
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Syntaxes/JavaScript (Rails).tmLanguage
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Syntaxes/RJS.tmLanguage
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Syntaxes/Ruby on Rails.plist
 delete mode 100644 bundles/ruby-on-rails.tmbundle/Syntaxes/SQL (Rails).plist
 delete mode 100644 bundles/ruby-on-rails.tmbundle/TODO
 delete mode 100644 bundles/ruby-on-rails.tmbundle/config/deploy.rb
 delete mode 100644 bundles/ruby-on-rails.tmbundle/config/slicehost.yml.sample
 delete mode 100644 bundles/ruby-on-rails.tmbundle/config/website.yml.sample
 delete mode 100644 bundles/ruby-on-rails.tmbundle/info.plist
 delete mode 100755 bundles/ruby-on-rails.tmbundle/script/clean_bundle_file_names
 delete mode 100755 bundles/ruby-on-rails.tmbundle/script/destroy
 delete mode 100755 bundles/ruby-on-rails.tmbundle/script/generate
 delete mode 100755 bundles/ruby-on-rails.tmbundle/script/txt2html
 delete mode 100644 bundles/ruby-on-rails.tmbundle/tasks/dist.rake
 delete mode 100644 bundles/ruby-on-rails.tmbundle/tasks/website.rake
 delete mode 100644 bundles/ruby-on-rails.tmbundle/website/demo.html
 delete mode 100644 bundles/ruby-on-rails.tmbundle/website/demo.txt
 delete mode 100644 bundles/ruby-on-rails.tmbundle/website/images/logo_bundle.png
 delete mode 100644 bundles/ruby-on-rails.tmbundle/website/index.html
 delete mode 100644 bundles/ruby-on-rails.tmbundle/website/index.txt
 delete mode 100644 bundles/ruby-on-rails.tmbundle/website/javascripts/rounded_corners_lite.inc.js
 delete mode 100644 bundles/ruby-on-rails.tmbundle/website/peepcode.html
 delete mode 100644 bundles/ruby-on-rails.tmbundle/website/peepcode.txt
 delete mode 100644 bundles/ruby-on-rails.tmbundle/website/stylesheets/screen.css
 delete mode 100644 bundles/ruby-on-rails.tmbundle/website/template.html.erb
 delete mode 100644 bundles/ruby.tmbundle/Commands/Check ERB Syntax.plist
 delete mode 100644 bundles/ruby.tmbundle/Commands/Check Ruby Syntax.plist
 delete mode 100644 bundles/ruby.tmbundle/Commands/Completion: Ruby (rcodetools).tmCommand
 delete mode 100644 bundles/ruby.tmbundle/Commands/Convert Ruby hash to 1_9 syntax.tmCommand
 delete mode 100644 bundles/ruby.tmbundle/Commands/Enclose in * (RDoc comments).tmCommand
 delete mode 100644 bundles/ruby.tmbundle/Commands/Enclose in + (RDoc comments).tmCommand
 delete mode 100644 bundles/ruby.tmbundle/Commands/Enclose in _ (RDoc comments).tmCommand
 delete mode 100644 bundles/ruby.tmbundle/Commands/Execute Line with Ruby.plist
 delete mode 100644 bundles/ruby.tmbundle/Commands/Execute and Insert Results.tmCommand
 delete mode 100644 bundles/ruby.tmbundle/Commands/Insert Missing Requires.plist
 delete mode 100644 bundles/ruby.tmbundle/Commands/Lookup in Documentation.plist
 delete mode 100644 bundles/ruby.tmbundle/Commands/Make Destructive Call.plist
 delete mode 100644 bundles/ruby.tmbundle/Commands/New Method.plist
 delete mode 100644 bundles/ruby.tmbundle/Commands/Omit from RDoc.tmCommand
 delete mode 100644 bundles/ruby.tmbundle/Commands/Open Require.tmCommand
 delete mode 100644 bundles/ruby.tmbundle/Commands/Run Rake Task.tmCommand
 delete mode 100644 bundles/ruby.tmbundle/Commands/Run focused unit test.plist
 delete mode 100644 bundles/ruby.tmbundle/Commands/Run.tmCommand
 delete mode 100644 bundles/ruby.tmbundle/Commands/Show RDoc for this file.plist
 delete mode 100644 bundles/ruby.tmbundle/Commands/Toggle ERb Tags.tmCommand
 delete mode 100644 bundles/ruby.tmbundle/Commands/Toggle Quote Style.plist
 delete mode 100644 bundles/ruby.tmbundle/Commands/Toggle String:Symbol.tmCommand
 delete mode 100644 bundles/ruby.tmbundle/Commands/Toggle ‘do … end’ : ‘{ … }’.tmCommand
 delete mode 100644 bundles/ruby.tmbundle/Commands/word_wrap()  (worw).plist
 delete mode 100644 bundles/ruby.tmbundle/DragCommands/Require Ruby File.tmDragCommand
 delete mode 100644 bundles/ruby.tmbundle/Macros/Benchmark_bmbm(__) do __ end.tmMacro
 delete mode 100644 bundles/ruby.tmbundle/Macros/Delete forward:backward.tmMacro
 delete mode 100644 bundles/ruby.tmbundle/Macros/Overwrite } in #{ .. }.plist
 delete mode 100644 bundles/ruby.tmbundle/Macros/PStore_new( __ ).tmMacro
 delete mode 100644 bundles/ruby.tmbundle/Macros/YAML.dump(.., file)  (Yd).plist
 delete mode 100644 bundles/ruby.tmbundle/Macros/YAML.load(file)  (Yl).plist
 delete mode 100644 bundles/ruby.tmbundle/Macros/class .. < DelegateClass .. initialize .. end  (class).plist
 delete mode 100644 bundles/ruby.tmbundle/Macros/each_char { |chr| .. }  (eac).plist
 delete mode 100644 bundles/ruby.tmbundle/Macros/each_cons(..) { |group| .. }  (eac).plist
 delete mode 100644 bundles/ruby.tmbundle/Macros/each_slice(..) { |group| .. }  (eas).plist
 delete mode 100644 bundles/ruby.tmbundle/Macros/extend Forwardable  (Forw).plist
 delete mode 100644 bundles/ruby.tmbundle/Macros/map_with_index { |e, i| .. }  (mapwi).plist
 delete mode 100644 "bundles/ruby.tmbundle/Macros/require_gem \"__\".tmMacro"
 delete mode 100644 bundles/ruby.tmbundle/Macros/xmlread(__).tmMacro
 delete mode 100644 bundles/ruby.tmbundle/Preferences/Block typing pairs.plist
 delete mode 100644 bundles/ruby.tmbundle/Preferences/Comments.plist
 delete mode 100644 bundles/ruby.tmbundle/Preferences/Completion: ENV[…] variables.tmPreferences
 delete mode 100644 bundles/ruby.tmbundle/Preferences/Completion: require strings.tmPreferences
 delete mode 100644 bundles/ruby.tmbundle/Preferences/Miscellaneous.plist
 delete mode 100644 bundles/ruby.tmbundle/Preferences/Symbo List: Method.plist
 delete mode 100644 bundles/ruby.tmbundle/Preferences/Symbol List: No Function Call.tmPreferences
 delete mode 100644 bundles/ruby.tmbundle/Snippets/# encoding:  UTF-8.tmSnippet
 delete mode 100644 bundles/ruby.tmbundle/Snippets/#!;usr;local;bin;ruby -w.plist
 delete mode 100644 bundles/ruby.tmbundle/Snippets/060 ruby if else.plist
 delete mode 100644 bundles/ruby.tmbundle/Snippets/070 ruby if.plist
 delete mode 100644 bundles/ruby.tmbundle/Snippets/080 ruby case.plist
 delete mode 100644 bundles/ruby.tmbundle/Snippets/:yields: RDoc comment.tmSnippet
 delete mode 100644 bundles/ruby.tmbundle/Snippets/Add '# =>' Marker.tmSnippet
 delete mode 100644 bundles/ruby.tmbundle/Snippets/Array.new(10) { |i| .. }  (Arr).plist
 delete mode 100644 bundles/ruby.tmbundle/Snippets/Benchmark_bmbm(__) do __ end.tmSnippet
 delete mode 100644 "bundles/ruby.tmbundle/Snippets/Dir.glob(\"..\") do |file| .. end  (Dir).plist"
 delete mode 100644 "bundles/ruby.tmbundle/Snippets/Dir[\"__\"].tmSnippet"
 delete mode 100644 "bundles/ruby.tmbundle/Snippets/File.foreach (\"..\") do |line| .. end  (File).plist"
 delete mode 100644 "bundles/ruby.tmbundle/Snippets/File_open(\"__\") { |file| __ }.tmSnippet"
 delete mode 100644 "bundles/ruby.tmbundle/Snippets/File_read(\"__\").tmSnippet"
 delete mode 100644 bundles/ruby.tmbundle/Snippets/Hash.new { |hash, key| hash[key] = .. }  (Has).plist
 delete mode 100644 bundles/ruby.tmbundle/Snippets/Insert ERb's <% __ %> or <%= __ %>.tmSnippet
 delete mode 100644 bundles/ruby.tmbundle/Snippets/Marshal.dump(obj, file)  (Md).plist
 delete mode 100644 bundles/ruby.tmbundle/Snippets/Marshal.load(obj)  (Ml).plist
 delete mode 100644 bundles/ruby.tmbundle/Snippets/PStore_new( __ ).tmSnippet
 delete mode 100644 bundles/ruby.tmbundle/Snippets/RDoc documentation block.tmSnippet
 delete mode 100644 bundles/ruby.tmbundle/Snippets/Wrap in Begin … Rescue … End.plist
 delete mode 100644 bundles/ruby.tmbundle/Snippets/YAML.dump(.., file)  (Yd-).plist
 delete mode 100644 bundles/ruby.tmbundle/Snippets/YAML.load(file)  (Yl-).plist
 delete mode 100644 bundles/ruby.tmbundle/Snippets/__END__.tmSnippet
 delete mode 100644 bundles/ruby.tmbundle/Snippets/alias_method ..  (am).plist
 delete mode 100644 bundles/ruby.tmbundle/Snippets/all? { |e| .. }  (all).plist
 delete mode 100644 bundles/ruby.tmbundle/Snippets/any? { |e| .. }  (any).plist
 delete mode 100644 bundles/ruby.tmbundle/Snippets/application_code ..  (app).plist
 delete mode 100644 bundles/ruby.tmbundle/Snippets/assert(..)  (as).plist
 delete mode 100644 bundles/ruby.tmbundle/Snippets/assert_equal.tmSnippet
 delete mode 100644 bundles/ruby.tmbundle/Snippets/assert_in_delta(..)  (asid).plist
 delete mode 100644 bundles/ruby.tmbundle/Snippets/assert_instance_of(..)  (asio).plist
 delete mode 100644 bundles/ruby.tmbundle/Snippets/assert_kind_of(..)  (asko).plist
 delete mode 100644 bundles/ruby.tmbundle/Snippets/assert_match(..)  (asm).plist
 delete mode 100644 bundles/ruby.tmbundle/Snippets/assert_nil(..)  (asn).plist
 delete mode 100644 bundles/ruby.tmbundle/Snippets/assert_no_match(..)  (asnm).plist
 delete mode 100644 bundles/ruby.tmbundle/Snippets/assert_not_equal(..)  (asne).plist
 delete mode 100644 bundles/ruby.tmbundle/Snippets/assert_not_nil(..)  (asnn).plist
 delete mode 100644 bundles/ruby.tmbundle/Snippets/assert_not_same(..)  (asns).plist
 delete mode 100644 bundles/ruby.tmbundle/Snippets/assert_nothing_raised(..) { .. }  (asnr).plist
 delete mode 100644 bundles/ruby.tmbundle/Snippets/assert_nothing_thrown { .. }  (asnt).plist
 delete mode 100644 bundles/ruby.tmbundle/Snippets/assert_operator(..)  (aso).plist
 delete mode 100644 bundles/ruby.tmbundle/Snippets/assert_raise(..) { .. }  (asr).plist
 delete mode 100644 bundles/ruby.tmbundle/Snippets/assert_respond_to(..)  (asrt).plist
 delete mode 100644 bundles/ruby.tmbundle/Snippets/assert_same(..)  (ass).plist
 delete mode 100644 bundles/ruby.tmbundle/Snippets/assert_send(..)  (ass).plist
 delete mode 100644 bundles/ruby.tmbundle/Snippets/assert_throws(..) { .. }  (ast).plist
 delete mode 100644 bundles/ruby.tmbundle/Snippets/attr_accessor ..  (rw).plist
 delete mode 100644 bundles/ruby.tmbundle/Snippets/attr_reader ..  (r).plist
 delete mode 100644 bundles/ruby.tmbundle/Snippets/attr_writer ..  (w).plist
 delete mode 100644 bundles/ruby.tmbundle/Snippets/class .. < DelegateClass .. initialize .. end  (class).plist
 delete mode 100644 bundles/ruby.tmbundle/Snippets/class .. < ParentClass .. initialize .. end.plist
 delete mode 100644 bundles/ruby.tmbundle/Snippets/class .. < Struct .. initialize .. end.plist
 delete mode 100644 bundles/ruby.tmbundle/Snippets/class .. < Test;;Unit;;TestCase .. end  (tc).plist
 delete mode 100644 bundles/ruby.tmbundle/Snippets/class .. end  (cla).plist
 delete mode 100644 bundles/ruby.tmbundle/Snippets/class .. initialize .. end.plist
 delete mode 100644 bundles/ruby.tmbundle/Snippets/class .. instance_methods .. undef .. initialize .. end  (class).plist
 delete mode 100644 bundles/ruby.tmbundle/Snippets/class << self __ end.tmSnippet
 delete mode 100644 bundles/ruby.tmbundle/Snippets/class_from_name()  (clafn).plist
 delete mode 100644 bundles/ruby.tmbundle/Snippets/classify { |e| .. }  (clas).plist
 delete mode 100644 bundles/ruby.tmbundle/Snippets/collect { |e| .. }  (col).plist
 delete mode 100644 bundles/ruby.tmbundle/Snippets/deep_copy(..)  (dee).plist
 delete mode 100644 bundles/ruby.tmbundle/Snippets/def end.plist
 delete mode 100644 bundles/ruby.tmbundle/Snippets/def initialize __ end.tmSnippet
 delete mode 100644 bundles/ruby.tmbundle/Snippets/def method_missing .. end  (mm).plist
 delete mode 100644 bundles/ruby.tmbundle/Snippets/def self .. end  (defs).plist
 delete mode 100644 bundles/ruby.tmbundle/Snippets/def test_ .. end  (t).plist
 delete mode 100644 bundles/ruby.tmbundle/Snippets/def_delegator .. (defd).plist
 delete mode 100644 bundles/ruby.tmbundle/Snippets/def_delegators .. (defds).plist
 delete mode 100644 bundles/ruby.tmbundle/Snippets/define_method ___ end.tmSnippet
 delete mode 100644 bundles/ruby.tmbundle/Snippets/delete_if { |e| .. }  (deli).plist
 delete mode 100644 bundles/ruby.tmbundle/Snippets/detect { |e| .. }  (det).plist
 delete mode 100644 bundles/ruby.tmbundle/Snippets/directory().tmSnippet
 delete mode 100644 bundles/ruby.tmbundle/Snippets/do |obj| .. end (doo).plist
 delete mode 100644 bundles/ruby.tmbundle/Snippets/downto(0) { |n| .. }  (dow).plist
 delete mode 100644 bundles/ruby.tmbundle/Snippets/each { |e| .. }  (ea).plist
 delete mode 100644 bundles/ruby.tmbundle/Snippets/each_byte { |byte| .. }  (eab).plist
 delete mode 100644 bundles/ruby.tmbundle/Snippets/each_char { |chr| .. }  (eac-).plist
 delete mode 100644 bundles/ruby.tmbundle/Snippets/each_cons(..) { |group| .. }  (eac-).plist
 delete mode 100644 bundles/ruby.tmbundle/Snippets/each_index { |i| .. }  (eai).plist
 delete mode 100644 bundles/ruby.tmbundle/Snippets/each_key { |key| .. }  (eak).plist
 delete mode 100644 bundles/ruby.tmbundle/Snippets/each_line { |line| .. }  (eal).plist
 delete mode 100644 bundles/ruby.tmbundle/Snippets/each_pair { |name, val| .. }  (eap).plist
 delete mode 100644 bundles/ruby.tmbundle/Snippets/each_slice { |group| .. }  (eas).plist
 delete mode 100644 bundles/ruby.tmbundle/Snippets/each_value { |val| .. }  (eav).plist
 delete mode 100644 bundles/ruby.tmbundle/Snippets/each_with_index { |e, i| .. }  (eawi).plist
 delete mode 100644 bundles/ruby.tmbundle/Snippets/elsif ___.tmSnippet
 delete mode 100644 bundles/ruby.tmbundle/Snippets/embed string variable.plist
 delete mode 100644 bundles/ruby.tmbundle/Snippets/extend Forwardable  (Forw).plist
 delete mode 100644 bundles/ruby.tmbundle/Snippets/fetch(name) { |key| .. }  (fet).plist
 delete mode 100644 bundles/ruby.tmbundle/Snippets/fill(range) { |i| .. }  (fil).plist
 delete mode 100644 bundles/ruby.tmbundle/Snippets/find { |e| .. }  (fin).plist
 delete mode 100644 bundles/ruby.tmbundle/Snippets/find_all { |e| .. }  (fina).plist
 delete mode 100644 bundles/ruby.tmbundle/Snippets/flatten_once  (fla).plist
 delete mode 100644 bundles/ruby.tmbundle/Snippets/flunk(..)  (fl).plist
 delete mode 100644 bundles/ruby.tmbundle/Snippets/grep(;pattern;) { |match| .. }  (gre).plist
 delete mode 100644 bundles/ruby.tmbundle/Snippets/gsub(;..;) { |match| .. }  (gsu).plist
 delete mode 100644 bundles/ruby.tmbundle/Snippets/hash pair (:).plist
 delete mode 100644 bundles/ruby.tmbundle/Snippets/hash pointer.plist
 delete mode 100644 bundles/ruby.tmbundle/Snippets/include Comparable ..  (Comp).plist
 delete mode 100644 bundles/ruby.tmbundle/Snippets/include Enumerable ..  (Enum).plist
 delete mode 100644 bundles/ruby.tmbundle/Snippets/inject(init) { |mem, var| .. }  (inj).plist
 delete mode 100644 bundles/ruby.tmbundle/Snippets/lambda { |args| .. }  (lam).plist
 delete mode 100644 bundles/ruby.tmbundle/Snippets/loop { __ }.tmSnippet
 delete mode 100644 bundles/ruby.tmbundle/Snippets/map { |e| .. }  (map).plist
 delete mode 100644 bundles/ruby.tmbundle/Snippets/map_with_index { |e, i| .. }  (mapwi).plist
 delete mode 100644 bundles/ruby.tmbundle/Snippets/max { |a, b| .. }  (max).plist
 delete mode 100644 bundles/ruby.tmbundle/Snippets/min { |a, b| .. }  (min).plist
 delete mode 100644 bundles/ruby.tmbundle/Snippets/module .. ClassMethods .. end.plist
 delete mode 100644 bundles/ruby.tmbundle/Snippets/module .. end.plist
 delete mode 100644 bundles/ruby.tmbundle/Snippets/module .. module_function .. end.plist
 delete mode 100644 bundles/ruby.tmbundle/Snippets/namespace :__ do __ end.tmSnippet
 delete mode 100644 bundles/ruby.tmbundle/Snippets/open yield block ({).plist
 delete mode 100644 "bundles/ruby.tmbundle/Snippets/open(\"path;or;url\", \"w\") do |doc| .. end (ope).plist"
 delete mode 100644 bundles/ruby.tmbundle/Snippets/option_parse { .. }  (optp).plist
 delete mode 100644 bundles/ruby.tmbundle/Snippets/partition { |e| .. }  (par).plist
 delete mode 100644 bundles/ruby.tmbundle/Snippets/pass(__).tmSnippet
 delete mode 100644 bundles/ruby.tmbundle/Snippets/path_from_here( __ ).tmSnippet
 delete mode 100644 bundles/ruby.tmbundle/Snippets/randomize  (ran).plist
 delete mode 100644 bundles/ruby.tmbundle/Snippets/reject { |e| .. }  (rej).plist
 delete mode 100644 "bundles/ruby.tmbundle/Snippets/require \"..\"  (req).plist"
 delete mode 100644 "bundles/ruby.tmbundle/Snippets/require \"tc_..\" ..  (ts).plist"
 delete mode 100644 "bundles/ruby.tmbundle/Snippets/require_gem \"__\".tmSnippet"
 delete mode 100644 bundles/ruby.tmbundle/Snippets/results_report(__) { __ }.tmSnippet
 delete mode 100644 bundles/ruby.tmbundle/Snippets/reverse_each { |e| .. }  (rea).plist
 delete mode 100644 bundles/ruby.tmbundle/Snippets/scan(;..;) { |match| .. }  (sca).plist
 delete mode 100644 bundles/ruby.tmbundle/Snippets/select { |e| .. }  (sel).plist
 delete mode 100644 bundles/ruby.tmbundle/Snippets/singleton_class().tmSnippet
 delete mode 100644 bundles/ruby.tmbundle/Snippets/skip(__).tmSnippet
 delete mode 100644 bundles/ruby.tmbundle/Snippets/sort { |a, b| .. }  (sor).plist
 delete mode 100644 bundles/ruby.tmbundle/Snippets/sort_by { |e| .. }  (sorb).plist
 delete mode 100644 bundles/ruby.tmbundle/Snippets/step(2) { |e| .. }  (ste).plist
 delete mode 100644 bundles/ruby.tmbundle/Snippets/sub(;..;) { |match| .. }  (sub).plist
 delete mode 100644 bundles/ruby.tmbundle/Snippets/task :task_name => [:dependent, :tasks] do __ end.tmSnippet
 delete mode 100644 bundles/ruby.tmbundle/Snippets/times { |n| .. }  (tim).plist
 delete mode 100644 bundles/ruby.tmbundle/Snippets/transaction( __ ) do __ end.tmSnippet
 delete mode 100644 bundles/ruby.tmbundle/Snippets/unix_filter .. (uni).plist
 delete mode 100644 bundles/ruby.tmbundle/Snippets/unless (unless).plist
 delete mode 100644 bundles/ruby.tmbundle/Snippets/until ___ end.tmSnippet
 delete mode 100644 bundles/ruby.tmbundle/Snippets/untitled.plist
 delete mode 100644 bundles/ruby.tmbundle/Snippets/upto(1.0;0.0) { |n| .. }  (upt).plist
 delete mode 100644 bundles/ruby.tmbundle/Snippets/usage_if()  (usai).plist
 delete mode 100644 bundles/ruby.tmbundle/Snippets/usage_unless()  (usau).plist
 delete mode 100644 bundles/ruby.tmbundle/Snippets/when.plist
 delete mode 100644 bundles/ruby.tmbundle/Snippets/while ___ end.tmSnippet
 delete mode 100644 bundles/ruby.tmbundle/Snippets/xmlread(__).tmSnippet
 delete mode 100644 bundles/ruby.tmbundle/Snippets/xpath(__) { __ }.tmSnippet
 delete mode 100644 bundles/ruby.tmbundle/Snippets/zip(enums) { |row| .. }  (zip).plist
 delete mode 100644 bundles/ruby.tmbundle/Support/RakeMate/rake_mate.rb
 delete mode 100644 bundles/ruby.tmbundle/Support/RakeMate/run_rake_task.rb
 delete mode 100644 bundles/ruby.tmbundle/Support/RubyMate/catch_exception.rb
 delete mode 100755 bundles/ruby.tmbundle/Support/RubyMate/run_script.rb
 delete mode 100644 bundles/ruby.tmbundle/Support/RubyMate/test.rb
 delete mode 100644 bundles/ruby.tmbundle/Support/RubyMate/todo.txt
 delete mode 100755 bundles/ruby.tmbundle/Support/bin/insert_requires.rb
 delete mode 100755 bundles/ruby.tmbundle/Support/bin/linked_ri.rb
 delete mode 100644 bundles/ruby.tmbundle/Support/bin/make_destructive.rb
 delete mode 100755 bundles/ruby.tmbundle/Support/bin/snippet_paren.rb
 delete mode 100644 bundles/ruby.tmbundle/Support/lib/ruby_requires.rb
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/README
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/CHANGES
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/README
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/README.TDC
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/README.emacs
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/README.ja
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/README.method_analysis
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/README.vim
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/README.xmpfilter
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/Rakefile
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/Rakefile.method_analysis
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/THANKS
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/anything-rcodetools.el
 delete mode 100755 bundles/ruby.tmbundle/Support/vendor/rcodetools/bin/rbtest
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/bin/rct-complete
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/bin/rct-doc
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/bin/rct-fork
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/bin/rct-fork-client
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/bin/rct-meth-args
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/bin/ruby-toggle-file
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/bin/xmpfilter
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/icicles-rcodetools.el
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/lib/method_analyzer.rb
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/lib/rcodetools/compat.rb
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/lib/rcodetools/completion.rb
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/lib/rcodetools/doc.rb
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/lib/rcodetools/fork.rb
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/lib/rcodetools/fork_config.rb
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/lib/rcodetools/options.rb
 delete mode 100755 bundles/ruby.tmbundle/Support/vendor/rcodetools/lib/rcodetools/xmpfilter.rb
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/lib/rcodetools/xmptestunitfilter.rb
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/lib/ruby_toggle_file.rb
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/license.txt
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/rcodetools.el
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/rcodetools.elc
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/rcodetools.gif
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/rcodetools.sxmp
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/rcodetools.vim
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/setup.rb
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/test/attic/test_run.rb
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/add_markers-input.rb
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/add_markers-output.rb
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/bindings-input.rb
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/bindings-output.rb
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/completion-input.rb
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/completion-output.rb
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/completion_class_info-input.rb
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/completion_class_info-output.rb
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/completion_class_info_no_candidates-input.rb
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/completion_class_info_no_candidates-output.rb
 delete mode 100755 bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/completion_detect_rbtest-input.rb
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/completion_detect_rbtest-output.rb
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/completion_detect_rbtest2-input.rb
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/completion_detect_rbtest2-output.rb
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/completion_emacs-input.rb
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/completion_emacs-output.rb
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/completion_emacs_icicles-input.rb
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/completion_emacs_icicles-output.rb
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/completion_in_method-input.rb
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/completion_in_method-output.rb
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/completion_in_method-test.rb
 delete mode 100755 bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/completion_rbtest-input.rb
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/completion_rbtest-output.rb
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/doc-input.rb
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/doc-output.rb
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/doc_detect_rbtest-input.rb
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/doc_detect_rbtest-output.rb
 delete mode 100755 bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/doc_detect_rbtest2-input.rb
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/doc_detect_rbtest2-output.rb
 delete mode 100755 bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/doc_rbtest-input.rb
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/doc_rbtest-output.rb
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/no_warnings-input.rb
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/no_warnings-output.rb
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/refe-input.rb
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/refe-output.rb
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/ri-input.rb
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/ri-output.rb
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/ri_emacs-input.rb
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/ri_emacs-output.rb
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/ri_vim-input.rb
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/ri_vim-output.rb
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/rspec-input.rb
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/rspec-output.rb
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/rspec_poetry-input.rb
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/rspec_poetry-output.rb
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/simple_annotation-input.rb
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/simple_annotation-output.rb
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/unit_test-input.rb
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/unit_test-output.rb
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/unit_test_detect_rbtest-input.rb
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/unit_test_detect_rbtest-output.rb
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/unit_test_detect_rbtest2-input.rb
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/unit_test_detect_rbtest2-output.rb
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/unit_test_poetry-input.rb
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/unit_test_poetry-output.rb
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/unit_test_rbtest-input.rb
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/unit_test_rbtest-output.rb
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/method_analyzer-data.rb
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/method_args.data.rb
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/rct-complete-TDC/completion_in_method__testmethod.taf
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/rct-complete-TDC/completion_in_method__testscript.taf
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/rct-complete-TDC/completion_in_method__wrong_testmethod.taf
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/rct-complete/completion.taf
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/rct-complete/completion_class_info.taf
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/rct-complete/completion_class_info_no_candidates.taf
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/rct-complete/completion_detect_rbtest.taf
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/rct-complete/completion_detect_rbtest2.taf
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/rct-complete/completion_emacs.taf
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/rct-complete/completion_emacs_icicles.taf
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/rct-complete/completion_rbtest.taf
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/rct-doc/doc.taf
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/rct-doc/doc_detect_rbtest.taf
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/rct-doc/doc_detect_rbtest2.taf
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/rct-doc/doc_rbtest.taf
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/rct-doc/refe.taf
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/rct-doc/ri.taf
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/rct-doc/ri_emacs.taf
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/rct-doc/ri_vim.taf
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/sample_test_script.rb
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/xmpfilter/add_markers.taf
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/xmpfilter/bindings.taf
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/xmpfilter/comment_out.taf
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/xmpfilter/exception.taf
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/xmpfilter/expectations.taf
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/xmpfilter/last_match.taf
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/xmpfilter/mult.rb
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/xmpfilter/multi_line_annotation_1.taf
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/xmpfilter/multi_line_annotation_2.taf
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/xmpfilter/multi_line_annotation_3.taf
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/xmpfilter/multi_line_annotation_4.taf
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/xmpfilter/multi_line_annotation_5.taf
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/xmpfilter/multi_line_annotation_6.taf
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/xmpfilter/multi_line_annotation_7.taf
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/xmpfilter/no_warnings.taf
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/xmpfilter/nospace.taf
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/xmpfilter/rspec.taf
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/xmpfilter/rspec_poetry.taf
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/xmpfilter/simple_annotation.taf
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/xmpfilter/unit_test.taf
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/xmpfilter/unit_test_detect_rbtest.taf
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/xmpfilter/unit_test_detect_rbtest2.taf
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/xmpfilter/unit_test_poetry.taf
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/xmpfilter/unit_test_rbtest.taf
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/xmpfilter/width.taf
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/test/test_completion.rb
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/test/test_doc.rb
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/test/test_functional.rb
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/test/test_method_analyzer.rb
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/test/test_method_args.rb
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/test/test_options.rb
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/test/test_ruby_toggle_file.rb
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/test/test_xmpfilter.rb
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/test/test_xmptestunitfilter.rb
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/test/tmp_functional.rb
 delete mode 100644 bundles/ruby.tmbundle/Support/vendor/rcodetools/test/tmp_run.rb
 delete mode 100644 bundles/ruby.tmbundle/Syntaxes/Ruby.plist
 delete mode 100644 bundles/ruby.tmbundle/Tests/division_ambiguity.rb
 delete mode 100644 bundles/ruby.tmbundle/Tests/modulo_ambiguity1.rb
 delete mode 100644 bundles/ruby.tmbundle/Tests/questionmark_ambiguity1.rb
 delete mode 100644 bundles/ruby.tmbundle/Tests/rubylexer/COPYING
 delete mode 100644 bundles/ruby.tmbundle/Tests/rubylexer/g.rb
 delete mode 100644 bundles/ruby.tmbundle/Tests/rubylexer/newsyntax.rb
 delete mode 100644 bundles/ruby.tmbundle/Tests/rubylexer/p.rb
 delete mode 100644 bundles/ruby.tmbundle/Tests/rubylexer/regtest.rb
 delete mode 100644 bundles/ruby.tmbundle/Tests/rubylexer/w.rb
 delete mode 100644 bundles/ruby.tmbundle/Tests/test1.rb
 delete mode 100644 bundles/ruby.tmbundle/info.plist
 delete mode 100644 bundles/text.tmbundle/Commands/Convert to ASCII.plist
 delete mode 100644 bundles/text.tmbundle/Commands/Convert to hex.plist
 delete mode 100644 bundles/text.tmbundle/Commands/Copy Matching Lines into New Document.tmCommand
 delete mode 100644 bundles/text.tmbundle/Commands/Copy Non-Matching Lines into New Document.tmCommand
 delete mode 100644 bundles/text.tmbundle/Commands/Decrypt selection.plist
 delete mode 100644 bundles/text.tmbundle/Commands/Distill Document : Selection.tmCommand
 delete mode 100644 bundles/text.tmbundle/Commands/Duplicate Line.plist
 delete mode 100644 bundles/text.tmbundle/Commands/Encrypt selection.plist
 delete mode 100644 bundles/text.tmbundle/Commands/Enumerate Lines.plist
 delete mode 100644 bundles/text.tmbundle/Commands/Open Current URL.plist
 delete mode 100644 bundles/text.tmbundle/Commands/Randomize Lines in Document : Selection.tmCommand
 delete mode 100644 bundles/text.tmbundle/Commands/Sort & Uniq.plist
 delete mode 100644 bundles/text.tmbundle/Commands/Sort.plist
 delete mode 100644 bundles/text.tmbundle/Commands/Speak Document : Selection.tmCommand
 delete mode 100644 bundles/text.tmbundle/Commands/Strip non-printables.plist
 delete mode 100644 bundles/text.tmbundle/Commands/Strip trailing spaces.plist
 delete mode 100644 bundles/text.tmbundle/Commands/Word Count.plist
 delete mode 100644 bundles/text.tmbundle/Macros/Delete Line.plist
 delete mode 100644 bundles/text.tmbundle/Macros/Delete to Beginning of Line.tmMacro
 delete mode 100644 bundles/text.tmbundle/Macros/EOL + . + LF.plist
 delete mode 100644 bundles/text.tmbundle/Macros/EOL + ..plist
 delete mode 100644 bundles/text.tmbundle/Macros/Join Lines.plist
 delete mode 100644 bundles/text.tmbundle/Preferences/Markup style: Bold.plist
 delete mode 100644 bundles/text.tmbundle/Preferences/Markup style: Italic.plist
 delete mode 100644 bundles/text.tmbundle/Preferences/Markup style: Underline.plist
 delete mode 100644 bundles/text.tmbundle/Preferences/Miscellaneous.plist
 delete mode 100644 bundles/text.tmbundle/Preferences/Spell checking.plist
 delete mode 100644 bundles/text.tmbundle/Snippets/010 Copyright.plist
 delete mode 100644 bundles/text.tmbundle/Snippets/Conitnue bullet.plist
 delete mode 100644 bundles/text.tmbundle/Snippets/Conitnue light bullet.plist
 delete mode 100644 bundles/text.tmbundle/Snippets/Conitnue star bullet.plist
 delete mode 100644 bundles/text.tmbundle/Snippets/Insert ISO date.plist
 delete mode 100644 bundles/text.tmbundle/Snippets/Lorem ipsum.plist
 delete mode 100644 bundles/text.tmbundle/Syntaxes/Plain text.plist
 delete mode 100644 bundles/text.tmbundle/Templates/Empty file/info.plist
 delete mode 100644 bundles/text.tmbundle/Templates/From Clipboard/info.plist
 delete mode 100644 bundles/text.tmbundle/info.plist

diff --git a/Rakefile b/Rakefile
index 3ee59be3e..79a9a5349 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,6 +1,7 @@
 require 'timeout'
 
 ATOM_SRC_PATH = File.dirname(__FILE__)
+DOT_ATOM_PATH = ENV['HOME'] + "/.atom"
 BUILD_DIR = 'atom-build'
 
 desc "Create xcode project from gpy file"
@@ -48,25 +49,47 @@ task :install => :build do
   `echo '#!/bin/sh\nopen #{dest} -n --args --resource-path="#{ATOM_SRC_PATH}" --executed-from="$(pwd)" $@' > #{cli_path} && chmod 755 #{cli_path}`
 
   Rake::Task["create-dot-atom"].invoke()
+  Rake::Task["clone-default-bundles"].invoke()
 
   puts "\033[32mType `atom` to start Atom! In Atom press `cmd-,` to edit your `.atom` directory\033[0m"
 end
 
 desc "Creates .atom file if non exists"
 task "create-dot-atom" do
-  dot_atom_path = ENV['HOME'] + "/.atom"
   dot_atom_template_path = ATOM_SRC_PATH + "/.atom"
   replace_dot_atom = false
-  return if Dir.exists?(dot_atom_path)
+  next if Dir.exists?(DOT_ATOM_PATH)
 
-  `rm -rf "#{dot_atom_path}"`
-  `mkdir "#{dot_atom_path}"`
-  `cp "#{dot_atom_template_path}/atom.coffee" "#{dot_atom_path}"`
+  `rm -rf "#{DOT_ATOM_PATH}"`
+  `mkdir "#{DOT_ATOM_PATH}"`
+  `cp "#{dot_atom_template_path}/atom.coffee" "#{DOT_ATOM_PATH}"`
 
   for path in Dir.entries(dot_atom_template_path)
     next if ["..", ".", "atom.coffee"].include? path
-    `ln -s "#{dot_atom_template_path}/#{path}" "#{dot_atom_path}"`
+    `ln -s "#{dot_atom_template_path}/#{path}" "#{DOT_ATOM_PATH}"`
   end
+end
+
+desc "Clone default bundles into .atom directory"
+task "clone-default-bundles" => "create-dot-atom" do
+  bundle_urls = [
+    "https://github.com/textmate/css.tmbundle.git",
+    "https://github.com/textmate/html.tmbundle.git",
+    "https://github.com/textmate/javascript.tmbundle.git",
+    "https://github.com/textmate/ruby-on-rails.tmbundle.git",
+    "https://github.com/textmate/ruby.tmbundle.git",
+    "https://github.com/textmate/text.tmbundle.git",
+    "https://github.com/jashkenas/coffee-script-tmbundle.git",
+    "https://github.com/cburyta/puppet-textmate.tmbundle.git",
+  ]
+
+  for bundle_url in bundle_urls
+    bundle_dir = bundle_url[/([^\/]+?)(\.git)?$/, 1]
+    dest_path = File.join(DOT_ATOM_PATH, "bundles", bundle_dir)
+    next if Dir.exists? dest_path
+    `git clone --quiet #{bundle_url} #{dest_path}`
+  end
+end
 
 desc "Clean build Atom via `xcodebuild`"
 task :clean do
@@ -85,7 +108,7 @@ task :run, [:atom_arg] => :build do |name, args|
 end
 
 desc "Run the specs"
-task :test => :clean do
+task :test => ["clean", "create-dot-atom"] do
   Rake::Task["run"].invoke("--test")
 end
 
diff --git a/bundles/CoffeeScriptBundle.tmbundle/.gitignore b/bundles/CoffeeScriptBundle.tmbundle/.gitignore
deleted file mode 100644
index f05fcdc11..000000000
--- a/bundles/CoffeeScriptBundle.tmbundle/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.cache
\ No newline at end of file
diff --git a/bundles/CoffeeScriptBundle.tmbundle/Commands/Align Assignments.tmCommand b/bundles/CoffeeScriptBundle.tmbundle/Commands/Align Assignments.tmCommand
deleted file mode 100644
index 8c625724e..000000000
--- a/bundles/CoffeeScriptBundle.tmbundle/Commands/Align Assignments.tmCommand	
+++ /dev/null
@@ -1,159 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>command</key>
-	<string>#!/usr/bin/env ruby
-#
-# Based on (from Source.tmbundle):
-#
-# Assignment block tidier, version 0.1.
-#
-# Copyright Chris Poirier 2006.
-# Licensed under the Academic Free License version 3.0.
-#
-# This script can be used as a command for TextMate to align all 
-# of the assignment signs within a block of text.  When using it with
-# TextMate, set the command input to "Selected Text" or "Document",
-# and the output to "Replace Selected Text".  Map it to a key 
-# equivalent, and any time you want to tidy up a block, either 
-# select it, or put your cursor somewhere within it; then hit the
-# key equivalent.  Voila.
-#
-# Note that this is the first version of the script, and it hasn't
-# been heavily tested.  You might encounter a bug or two. 
-#
-# Note (by Dr Nic) - the "first version" seems to have worked for years.
-# I hope the CoffeeScript version is as successful.
-#
-# Per the license, use of this script is ENTIRELY at your own risk.
-# See the license for full details (they override anything I've 
-# said here).
-
-lines = STDIN.readlines()
-selected_text = ENV.member?("TM_SELECTED_TEXT")
-
-relevant_line_pattern = /^[^:]+:/
-column_search_pattern = /[\t ]*:/
-
-comments = []
-
-begin
-  #
-  # If called on a selection, every assignment statement
-  # is in the block.  If called on the document, we start on the 
-  # current line and look up and down for the start and end of the
-  # block.
-
-  if selected_text then
-     block_top    = 1
-     block_bottom = lines.length
-  else
- 
-     #
-     # We start looking on the current line.  However, if the
-     # current line doesn't match the pattern, we may be just
-     # after or just before a block, and we should check.  If
-     # neither, we are done.
-
-     start_on      = ENV["TM_LINE_NUMBER"].to_i
-     block_top     = lines.length + 1
-     block_bottom  = 0
-     search_top    = 1
-     search_bottom = lines.length
-     search_failed = false
-
-     if lines[start_on - 1] !~ relevant_line_pattern then
-        if lines[start_on - 2] =~ relevant_line_pattern then
-           search_bottom = start_on = start_on - 1
-        elsif lines[start_on] =~ relevant_line_pattern then
-           search_top = start_on = start_on
-        else
-           search_failed = true
-        end 
-     end
-
-     #
-     # Now with the search boundaries set, start looking for
-     # the block top and bottom.
-   
-     unless search_failed
-        start_on.downto(search_top) do |number|
-           if lines[number-1] =~ relevant_line_pattern then
-              block_top = number
-           else
-              break
-           end
-        end
-      
-        start_on.upto(search_bottom) do |number|
-           if lines[number-1] =~ relevant_line_pattern then
-              block_bottom = number
-           else
-              break
-           end
-        end
-     end
-  end
-
-  #
-  # Now, iterate over the block and find the best column number
-  # for the = sign.  The pattern will tell us the position of the
-  # first bit of whitespace before the equal sign.  We put the
-  # equals sign to the right of the furthest-right one.  Note that
-  # we cannot assume every line in the block is relevant.
-
-  best_column = 0
-  block_top.upto(block_bottom) do |number|
-    line = lines[number - 1]
-    if line =~ relevant_line_pattern then
-      m = column_search_pattern.match(line)
-      best_column = m.begin(0) if m.begin(0) &gt; best_column
-    end
-  end
-
-   
-  #
-  # Reformat the block.  Again, we cannot assume all lines in the 
-  # block are relevant.
-
-  block_top.upto(block_bottom) do |number|
-     if lines[number-1] =~ relevant_line_pattern then
-        before, after = lines[number-1].split(/[\t ]*:[\t ]*/, 2)
-        # lines[number-1] = [before.ljust(best_column), after].join(after[0,1] == '&gt;' ? ":" : ": ")
-        lines[number-1] = ["#{before}:".ljust(best_column + 2), after].join
-     end
-  end
-
-
-rescue =&gt; e
-  comments &lt;&lt; "Error: #{e.inspect}"
-  comments &lt;&lt; e.backtrace
-end
-
-#
-# Output the replacement text
-
-lines.each do |line|
-   puts line
-end
-
-comments.flatten.each { |c| puts "# #{c}" }
-
-</string>
-	<key>input</key>
-	<string>selection</string>
-	<key>keyEquivalent</key>
-	<string>~@]</string>
-	<key>name</key>
-	<string>Align Assignments</string>
-	<key>output</key>
-	<string>replaceSelectedText</string>
-	<key>scope</key>
-	<string>source.coffee</string>
-	<key>uuid</key>
-	<string>EE3293A5-3761-40BD-9CA8-DAAA176AA19E</string>
-</dict>
-</plist>
diff --git a/bundles/CoffeeScriptBundle.tmbundle/Commands/CoffeeScript.sublime-build b/bundles/CoffeeScriptBundle.tmbundle/Commands/CoffeeScript.sublime-build
deleted file mode 100644
index 7fa2c6c77..000000000
--- a/bundles/CoffeeScriptBundle.tmbundle/Commands/CoffeeScript.sublime-build
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-	"path": "$HOME/bin:/usr/local/bin:$PATH",
-	"cmd": ["coffee","-c","$file"],
-	"file_regex": "^(...*?):([0-9]*):?([0-9]*)",
-	"selector": "source.coffee"
-}
diff --git a/bundles/CoffeeScriptBundle.tmbundle/Commands/Compile and Display JS.tmCommand b/bundles/CoffeeScriptBundle.tmbundle/Commands/Compile and Display JS.tmCommand
deleted file mode 100644
index bacb8a846..000000000
--- a/bundles/CoffeeScriptBundle.tmbundle/Commands/Compile and Display JS.tmCommand	
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>command</key>
-	<string>#!/bin/bash
-
-function pre {
-	echo -n '&lt;pre style="word-wrap: break-word;"&gt;'
-	perl -pe '$| = 1; s/&amp;/&amp;amp;/g; s/&lt;/&amp;lt;/g; s/&gt;/&amp;gt;/g; s/$\\n/&lt;br&gt;/'
-	echo '&lt;/pre&gt;'
-}
-
-${TM_COFFEE:=coffee} -scp --bare | pre
-</string>
-	<key>fallbackInput</key>
-	<string>document</string>
-	<key>input</key>
-	<string>selection</string>
-	<key>keyEquivalent</key>
-	<string>@b</string>
-	<key>name</key>
-	<string>Compile and Display JS</string>
-	<key>output</key>
-	<string>showAsHTML</string>
-	<key>scope</key>
-	<string>source.coffee</string>
-	<key>uuid</key>
-	<string>D749F761-1740-4918-9490-90DF376BA72E</string>
-</dict>
-</plist>
diff --git a/bundles/CoffeeScriptBundle.tmbundle/Commands/Insert Heredoc comment.tmCommand b/bundles/CoffeeScriptBundle.tmbundle/Commands/Insert Heredoc comment.tmCommand
deleted file mode 100644
index db50c48a5..000000000
--- a/bundles/CoffeeScriptBundle.tmbundle/Commands/Insert Heredoc comment.tmCommand	
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>command</key>
-	<string>#!/usr/bin/env ruby
-
-column_number = ENV['TM_COLUMN_NUMBER']
-whitespace    = " " * (column_number.to_i - 1)
-
-print &lt;&lt;-EOS
-###
-#{whitespace}$0
-#{whitespace}###
-EOS
-</string>
-	<key>fallbackInput</key>
-	<string>line</string>
-	<key>input</key>
-	<string>none</string>
-	<key>keyEquivalent</key>
-	<string>^#</string>
-	<key>name</key>
-	<string>Insert Heredoc """ comment</string>
-	<key>output</key>
-	<string>insertAsSnippet</string>
-	<key>scope</key>
-	<string>source.coffee</string>
-	<key>uuid</key>
-	<string>68A86250-0280-11E0-A976-0800200C9A66</string>
-</dict>
-</plist>
diff --git a/bundles/CoffeeScriptBundle.tmbundle/Commands/Insert Heredoc triple double quotes.tmCommand b/bundles/CoffeeScriptBundle.tmbundle/Commands/Insert Heredoc triple double quotes.tmCommand
deleted file mode 100644
index a3be8546b..000000000
--- a/bundles/CoffeeScriptBundle.tmbundle/Commands/Insert Heredoc triple double quotes.tmCommand	
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>command</key>
-	<string>#!/usr/bin/env ruby
-
-column_number = ENV['TM_COLUMN_NUMBER']
-whitespace    = " " * (column_number.to_i - 1)
-
-print &lt;&lt;-EOS
-"""
-#{whitespace}$0
-#{whitespace}"""
-EOS
-</string>
-	<key>fallbackInput</key>
-	<string>line</string>
-	<key>input</key>
-	<string>none</string>
-	<key>keyEquivalent</key>
-	<string>@"</string>
-	<key>name</key>
-	<string>Insert Heredoc """ quotes</string>
-	<key>output</key>
-	<string>insertAsSnippet</string>
-	<key>scope</key>
-	<string>source.coffee</string>
-	<key>uuid</key>
-	<string>F08537AF-4F02-4040-999D-F0785CF64C02</string>
-</dict>
-</plist>
diff --git a/bundles/CoffeeScriptBundle.tmbundle/Commands/Insert Heredoc triple single quotes.tmCommand b/bundles/CoffeeScriptBundle.tmbundle/Commands/Insert Heredoc triple single quotes.tmCommand
deleted file mode 100644
index 7584d19f5..000000000
--- a/bundles/CoffeeScriptBundle.tmbundle/Commands/Insert Heredoc triple single quotes.tmCommand	
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>command</key>
-	<string>#!/usr/bin/env ruby
-
-column_number = ENV['TM_COLUMN_NUMBER']
-whitespace    = " " * (column_number.to_i - 1)
-
-print &lt;&lt;-EOS
-'''
-#{whitespace}$0
-#{whitespace}'''
-EOS
-</string>
-	<key>fallbackInput</key>
-	<string>line</string>
-	<key>input</key>
-	<string>none</string>
-	<key>keyEquivalent</key>
-	<string>@'</string>
-	<key>name</key>
-	<string>Insert Heredoc ''' quotes</string>
-	<key>output</key>
-	<string>insertAsSnippet</string>
-	<key>scope</key>
-	<string>source.coffee</string>
-	<key>uuid</key>
-	<string>C4F99E3D-1540-4BC1-8038-0A19D65BABC8</string>
-</dict>
-</plist>
diff --git a/bundles/CoffeeScriptBundle.tmbundle/Commands/New Function.tmCommand b/bundles/CoffeeScriptBundle.tmbundle/Commands/New Function.tmCommand
deleted file mode 100644
index 3833b4716..000000000
--- a/bundles/CoffeeScriptBundle.tmbundle/Commands/New Function.tmCommand	
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>command</key>
-	<string>cat &lt;&lt;SNIPPET
-${TM_SELECTED_TEXT:-$TM_CURRENT_WORD} = (\${1:args}) -&gt;
-  \$0
-SNIPPET</string>
-	<key>fallbackInput</key>
-	<string>word</string>
-	<key>input</key>
-	<string>selection</string>
-	<key>keyEquivalent</key>
-	<string>$
</string>
-	<key>name</key>
-	<string>New Function</string>
-	<key>output</key>
-	<string>insertAsSnippet</string>
-	<key>scope</key>
-	<string>source.coffee</string>
-	<key>uuid</key>
-	<string>192428A1-8684-4172-8728-225B4C9E532F</string>
-</dict>
-</plist>
diff --git a/bundles/CoffeeScriptBundle.tmbundle/Commands/Run selected text.tmCommand b/bundles/CoffeeScriptBundle.tmbundle/Commands/Run selected text.tmCommand
deleted file mode 100644
index e1f72fda3..000000000
--- a/bundles/CoffeeScriptBundle.tmbundle/Commands/Run selected text.tmCommand	
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>command</key>
-	<string>#!/bin/bash
-
-${TM_COFFEE:=coffee} -s
-</string>
-	<key>input</key>
-	<string>selection</string>
-	<key>keyEquivalent</key>
-	<string>@R</string>
-	<key>name</key>
-	<string>Run selected text</string>
-	<key>output</key>
-	<string>showAsTooltip</string>
-	<key>scope</key>
-	<string>source.coffee</string>
-	<key>uuid</key>
-	<string>90424631-D00B-448C-B157-DAC92DFB2858</string>
-</dict>
-</plist>
diff --git a/bundles/CoffeeScriptBundle.tmbundle/Commands/Run.tmCommand b/bundles/CoffeeScriptBundle.tmbundle/Commands/Run.tmCommand
deleted file mode 100644
index 0e46226d5..000000000
--- a/bundles/CoffeeScriptBundle.tmbundle/Commands/Run.tmCommand
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>command</key>
-	<string>#!/bin/bash
-
-function pre {
-	echo -n '&lt;pre style="word-wrap: break-word;"&gt;'
-	perl -pe '$| = 1; s/&amp;/&amp;amp;/g; s/&lt;/&amp;lt;/g; s/&gt;/&amp;gt;/g; s/$\\n/&lt;br&gt;/'
-	echo '&lt;/pre&gt;'
-}
-
-
-${TM_COFFEE:=coffee} -s | pre
-</string>
-	<key>input</key>
-	<string>selection</string>
-	<key>keyEquivalent</key>
-	<string>@r</string>
-	<key>name</key>
-	<string>Run</string>
-	<key>output</key>
-	<string>showAsHTML</string>
-	<key>scope</key>
-	<string>source.coffee</string>
-	<key>uuid</key>
-	<string>30395DAB-44A6-44F7-99E1-02D64621303A</string>
-</dict>
-</plist>
diff --git a/bundles/CoffeeScriptBundle.tmbundle/Preferences/CoffeeScript.tmPreferences b/bundles/CoffeeScriptBundle.tmbundle/Preferences/CoffeeScript.tmPreferences
deleted file mode 100644
index 1fdfb720d..000000000
--- a/bundles/CoffeeScriptBundle.tmbundle/Preferences/CoffeeScript.tmPreferences
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>name</key>
-	<string>Comments</string>
-	<key>scope</key>
-	<string>source.coffee</string>
-	<key>settings</key>
-	<dict>
-		<key>shellVariables</key>
-		<array>
-			<dict>
-				<key>name</key>
-				<string>TM_COMMENT_START</string>
-				<key>value</key>
-				<string># </string>
-			</dict>
-			<dict>
-				<key>name</key>
-				<string>TM_COMMENT_START_2</string>
-				<key>value</key>
-				<string>###</string>
-			</dict>
-			<dict>
-				<key>name</key>
-				<string>TM_COMMENT_END_2</string>
-				<key>value</key>
-				<string>###</string>
-			</dict>
-		</array>
-	</dict>
-	<key>uuid</key>
-	<string>0A92C6F6-4D73-4859-B38C-4CC19CBC191F</string>
-</dict>
-</plist>
diff --git a/bundles/CoffeeScriptBundle.tmbundle/Preferences/Disable Indent Corrections.tmPreferences b/bundles/CoffeeScriptBundle.tmbundle/Preferences/Disable Indent Corrections.tmPreferences
deleted file mode 100644
index 9974f05e5..000000000
--- a/bundles/CoffeeScriptBundle.tmbundle/Preferences/Disable Indent Corrections.tmPreferences	
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>name</key>
-	<string>Disable Indent Corrections</string>
-	<key>scope</key>
-	<string>source.coffee</string>
-	<key>settings</key>
-	<dict>
-		<key>disableIndentCorrections</key>
-		<true/>
-	</dict>
-	<key>uuid</key>
-	<string>5E57C0C3-77D5-4809-A131-F777EE264908</string>
-</dict>
-</plist>
diff --git a/bundles/CoffeeScriptBundle.tmbundle/Preferences/Indent.tmPreferences b/bundles/CoffeeScriptBundle.tmbundle/Preferences/Indent.tmPreferences
deleted file mode 100644
index 78b7bdf03..000000000
--- a/bundles/CoffeeScriptBundle.tmbundle/Preferences/Indent.tmPreferences
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>name</key>
-	<string>Indent</string>
-	<key>scope</key>
-	<string>source.coffee</string>
-	<key>settings</key>
-	<dict>
-		<key>decreaseIndentPattern</key>
-		<string>^\s*(\}|\]|else|catch|finally)$</string>
-		<key>increaseIndentPattern</key>
-		<string>(?x)
-		^\s*
-		(.*class\s+
-		|[a-zA-Z\$_](\w|\$|:|\.)*\s*(?=\:(\s*\(.*\))?\s*((=|-)&gt;\s*$)) # function that is not one line
-		|[a-zA-Z\$_](\w|\$|\.)*\s*(:|=)\s*((if|while)(?!.*?then)|for|$) # assignment using multiline if/while/for
-		|(if|while)\b(?!.*?then)|for\b
-		|(try|finally|catch\s+\S.*)\s*$
-		|.*[-=]&gt;$
-		|.*[\{\[]$)</string>
-	</dict>
-	<key>uuid</key>
-	<string>C5D6C716-12FE-4CE8-A916-6CABEDE8AFE7</string>
-</dict>
-</plist>
diff --git a/bundles/CoffeeScriptBundle.tmbundle/Preferences/Symbol List Method 2.tmPreferences b/bundles/CoffeeScriptBundle.tmbundle/Preferences/Symbol List Method 2.tmPreferences
deleted file mode 100644
index ff94bf216..000000000
--- a/bundles/CoffeeScriptBundle.tmbundle/Preferences/Symbol List Method 2.tmPreferences	
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>name</key>
-	<string>Symbol List: Method</string>
-	<key>scope</key>
-	<string>source.coffee meta.function.coffee</string>
-	<key>settings</key>
-	<dict>
-		<key>showInSymbolList</key>
-		<integer>1</integer>
-		<key>symbolTransformation</key>
-		<string>s/^\s*([a-zA-Z\$_]+)\s*=/$2/</string>
-	</dict>
-	<key>uuid</key>
-	<string>419D24D8-0DD6-4D9A-8CA0-6D9CD740BEEC</string>
-</dict>
-</plist>
diff --git a/bundles/CoffeeScriptBundle.tmbundle/Preferences/Symbol List Method.tmPreferences b/bundles/CoffeeScriptBundle.tmbundle/Preferences/Symbol List Method.tmPreferences
deleted file mode 100644
index 624eee22f..000000000
--- a/bundles/CoffeeScriptBundle.tmbundle/Preferences/Symbol List Method.tmPreferences	
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>name</key>
-	<string>Symbol List: Method Instance</string>
-	<key>scope</key>
-	<string>source.coffee entity.name.type.instance</string>
-	<key>settings</key>
-	<dict>
-		<key>showInSymbolList</key>
-		<integer>0</integer>
-	</dict>
-	<key>uuid</key>
-	<string>B087AF2F-8946-4EA9-8409-49E7C4A2EEF0</string>
-</dict>
-</plist>
diff --git a/bundles/CoffeeScriptBundle.tmbundle/README.markdown b/bundles/CoffeeScriptBundle.tmbundle/README.markdown
deleted file mode 100644
index cd6fd7839..000000000
--- a/bundles/CoffeeScriptBundle.tmbundle/README.markdown
+++ /dev/null
@@ -1,21 +0,0 @@
-CoffeeScript.tmbundle
----------------------
-
-A **TextMate Bundle** for the **CoffeeScript** programming language.
-    
-Installation:
--------------
-
-    cd ~/Library/Application\ Support/TextMate/Bundles (Textmate 1)
-    cd /Applications/TextMate.app/Contents/SharedSupport/Bundles (Textmate 1.5.10 & 2)
-    git clone git://github.com/jashkenas/coffee-script-tmbundle CoffeeScriptBundle.tmbundle
-
-The bundle includes syntax highlighting, the ability to compile or evaluate CoffeeScript inline, convenient symbol listing for functions, and a number of expando snippets.
-
-Patches for additions are always welcome.
-
-![screenshot](http://jashkenas.s3.amazonaws.com/images/coffeescript/textmate-highlighting.png)
-
-If your TextMate.app is having trouble finding the `coffee` command, remember that [TextMate doesn't inherit your regular PATH](http://wiki.macromates.com/Troubleshooting/TextMateAndThePath). 
-
-
diff --git a/bundles/CoffeeScriptBundle.tmbundle/Snippets/Array comprehension.tmSnippet b/bundles/CoffeeScriptBundle.tmbundle/Snippets/Array comprehension.tmSnippet
deleted file mode 100644
index 826cb1264..000000000
--- a/bundles/CoffeeScriptBundle.tmbundle/Snippets/Array comprehension.tmSnippet	
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>for ${1:name} in ${2:array}
-  ${0:# body...}</string>
-	<key>name</key>
-	<string>Array Comprehension</string>
-	<key>scope</key>
-	<string>source.coffee</string>
-	<key>tabTrigger</key>
-	<string>fora</string>
-	<key>uuid</key>
-	<string>2D4AC0B4-47AA-4E38-9A11-09A48C2A9439</string>
-</dict>
-</plist>
diff --git a/bundles/CoffeeScriptBundle.tmbundle/Snippets/Bound Function.tmSnippet b/bundles/CoffeeScriptBundle.tmbundle/Snippets/Bound Function.tmSnippet
deleted file mode 100644
index 1e3fe0e2e..000000000
--- a/bundles/CoffeeScriptBundle.tmbundle/Snippets/Bound Function.tmSnippet	
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>(${1:args}) =&gt;
-  ${0:# body...}</string>
-	<key>name</key>
-	<string>Function (bound)</string>
-	<key>scope</key>
-	<string>source.coffee</string>
-	<key>tabTrigger</key>
-	<string>bfun</string>
-	<key>uuid</key>
-	<string>20BDC055-ED67-4D0E-A47F-ADAA828EFF2B</string>
-</dict>
-</plist>
diff --git a/bundles/CoffeeScriptBundle.tmbundle/Snippets/Class.tmSnippet b/bundles/CoffeeScriptBundle.tmbundle/Snippets/Class.tmSnippet
deleted file mode 100644
index a666926fc..000000000
--- a/bundles/CoffeeScriptBundle.tmbundle/Snippets/Class.tmSnippet
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>class ${1:ClassName}${2: extends ${3:Ancestor}}
-
-  ${4:constructor: (${5:args}) -&gt;
-    ${6:# body...}}
-  $7</string>
-	<key>name</key>
-	<string>Class</string>
-	<key>scope</key>
-	<string>source.coffee</string>
-	<key>tabTrigger</key>
-	<string>cla</string>
-	<key>uuid</key>
-	<string>765ACBD3-380A-4CF8-9111-345A36A0DAE7</string>
-</dict>
-</plist>
diff --git a/bundles/CoffeeScriptBundle.tmbundle/Snippets/Else if.tmSnippet b/bundles/CoffeeScriptBundle.tmbundle/Snippets/Else if.tmSnippet
deleted file mode 100644
index 6e2fd3688..000000000
--- a/bundles/CoffeeScriptBundle.tmbundle/Snippets/Else if.tmSnippet	
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>else if ${1:condition}
-  ${0:# body...}</string>
-	<key>name</key>
-	<string>Else if</string>
-	<key>scope</key>
-	<string>source.coffee</string>
-	<key>tabTrigger</key>
-	<string>elif</string>
-	<key>uuid</key>
-	<string>EA8F5EDB-6E1E-4C36-9CA5-12B108F1A7C9</string>
-</dict>
-</plist>
diff --git a/bundles/CoffeeScriptBundle.tmbundle/Snippets/Function.tmSnippet b/bundles/CoffeeScriptBundle.tmbundle/Snippets/Function.tmSnippet
deleted file mode 100644
index 6e58a6a1c..000000000
--- a/bundles/CoffeeScriptBundle.tmbundle/Snippets/Function.tmSnippet
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>(${1:args}) -&gt;
-  ${0:# body...}
-
-</string>
-	<key>name</key>
-	<string>Function</string>
-	<key>scope</key>
-	<string>source.coffee</string>
-	<key>tabTrigger</key>
-	<string>fun</string>
-	<key>uuid</key>
-	<string>F2E2E79A-A85D-471D-9847-72AE40205942</string>
-</dict>
-</plist>
diff --git a/bundles/CoffeeScriptBundle.tmbundle/Snippets/If __ Else.tmSnippet b/bundles/CoffeeScriptBundle.tmbundle/Snippets/If __ Else.tmSnippet
deleted file mode 100644
index 409d0aa63..000000000
--- a/bundles/CoffeeScriptBundle.tmbundle/Snippets/If __ Else.tmSnippet	
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>if ${1:condition}
-  ${2:# body...}
-else
-  ${3:# body...}</string>
-	<key>name</key>
-	<string>If .. Else</string>
-	<key>scope</key>
-	<string>source.coffee</string>
-	<key>tabTrigger</key>
-	<string>ife</string>
-	<key>uuid</key>
-	<string>2AD19F12-E499-4715-9A47-FC8D594BC550</string>
-</dict>
-</plist>
diff --git a/bundles/CoffeeScriptBundle.tmbundle/Snippets/If.tmSnippet b/bundles/CoffeeScriptBundle.tmbundle/Snippets/If.tmSnippet
deleted file mode 100644
index 734b5c2eb..000000000
--- a/bundles/CoffeeScriptBundle.tmbundle/Snippets/If.tmSnippet
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>if ${1:condition}
-  ${0:# body...}</string>
-	<key>name</key>
-	<string>If</string>
-	<key>scope</key>
-	<string>source.coffee</string>
-	<key>tabTrigger</key>
-	<string>if</string>
-	<key>uuid</key>
-	<string>F4FDFB3A-71EF-48A4-93F4-178B949546B1</string>
-</dict>
-</plist>
diff --git a/bundles/CoffeeScriptBundle.tmbundle/Snippets/Interpolated Code.tmSnippet b/bundles/CoffeeScriptBundle.tmbundle/Snippets/Interpolated Code.tmSnippet
deleted file mode 100644
index 72c839f80..000000000
--- a/bundles/CoffeeScriptBundle.tmbundle/Snippets/Interpolated Code.tmSnippet	
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>#{${1:$TM_SELECTED_TEXT}}</string>
-	<key>keyEquivalent</key>
-	<string>#</string>
-	<key>name</key>
-	<string>Interpolated Code</string>
-	<key>scope</key>
-	<string>(string.quoted.double.coffee) - string source, (string.quoted.double.heredoc.coffee) - string source</string>
-	<key>tabTrigger</key>
-	<string>#</string>
-	<key>uuid</key>
-	<string>C04ED189-6ACB-44E6-AD5B-911B760AD1CC</string>
-</dict>
-</plist>
diff --git a/bundles/CoffeeScriptBundle.tmbundle/Snippets/Object comprehension.tmSnippet b/bundles/CoffeeScriptBundle.tmbundle/Snippets/Object comprehension.tmSnippet
deleted file mode 100644
index faac99251..000000000
--- a/bundles/CoffeeScriptBundle.tmbundle/Snippets/Object comprehension.tmSnippet	
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>for ${1:key}, ${2:value} of ${3:Object}
-  ${0:# body...}</string>
-	<key>name</key>
-	<string>Object comprehension</string>
-	<key>scope</key>
-	<string>source.coffee</string>
-	<key>tabTrigger</key>
-	<string>foro</string>
-	<key>uuid</key>
-	<string>9D126CC5-EA14-4A40-B6D3-6A5FC1AC1420</string>
-</dict>
-</plist>
diff --git a/bundles/CoffeeScriptBundle.tmbundle/Snippets/Range comprehension (exclusive).tmSnippet b/bundles/CoffeeScriptBundle.tmbundle/Snippets/Range comprehension (exclusive).tmSnippet
deleted file mode 100644
index 9d26ddd69..000000000
--- a/bundles/CoffeeScriptBundle.tmbundle/Snippets/Range comprehension (exclusive).tmSnippet	
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>for ${1:name} in [${2:start}...${3:finish}]${4: by ${5:step}}
-  ${0:# body...}</string>
-	<key>name</key>
-	<string>Range comprehension (exclusive)</string>
-	<key>scope</key>
-	<string>source.coffee</string>
-	<key>tabTrigger</key>
-	<string>forrex</string>
-	<key>uuid</key>
-	<string>FA6AB9BF-3444-4A8C-B010-C95C2CF5BAB3</string>
-</dict>
-</plist>
diff --git a/bundles/CoffeeScriptBundle.tmbundle/Snippets/Range comprehension (inclusive).tmSnippet b/bundles/CoffeeScriptBundle.tmbundle/Snippets/Range comprehension (inclusive).tmSnippet
deleted file mode 100644
index 991a15748..000000000
--- a/bundles/CoffeeScriptBundle.tmbundle/Snippets/Range comprehension (inclusive).tmSnippet	
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>for ${1:name} in [${2:start}..${3:finish}]${4: by ${5:step}}
-  ${0:# body...}</string>
-	<key>name</key>
-	<string>Range comprehension (inclusive)</string>
-	<key>scope</key>
-	<string>source.coffee</string>
-	<key>tabTrigger</key>
-	<string>forr</string>
-	<key>uuid</key>
-	<string>E0F8E45A-9262-4DD6-ADFF-B5B9D6CE99C2</string>
-</dict>
-</plist>
diff --git a/bundles/CoffeeScriptBundle.tmbundle/Snippets/Raw javascript.tmSnippet b/bundles/CoffeeScriptBundle.tmbundle/Snippets/Raw javascript.tmSnippet
deleted file mode 100644
index c51d264ec..000000000
--- a/bundles/CoffeeScriptBundle.tmbundle/Snippets/Raw javascript.tmSnippet	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>\`${1:`pbpaste`}\`</string>
-	<key>keyEquivalent</key>
-	<string>^j</string>
-	<key>name</key>
-	<string>Raw javascript</string>
-	<key>scope</key>
-	<string>source.coffee</string>
-	<key>uuid</key>
-	<string>422A59E7-FC36-4E99-B01C-6353515BB544</string>
-</dict>
-</plist>
diff --git a/bundles/CoffeeScriptBundle.tmbundle/Snippets/Switch.tmSnippet b/bundles/CoffeeScriptBundle.tmbundle/Snippets/Switch.tmSnippet
deleted file mode 100644
index 6ebe7fb85..000000000
--- a/bundles/CoffeeScriptBundle.tmbundle/Snippets/Switch.tmSnippet
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>switch ${1:object}
-  when ${2:value}
-    ${0:# body...}</string>
-	<key>name</key>
-	<string>Switch</string>
-	<key>scope</key>
-	<string>source.coffee</string>
-	<key>tabTrigger</key>
-	<string>swi</string>
-	<key>uuid</key>
-	<string>3931A7C6-F1FB-484F-82D1-26F5A8F779D0</string>
-</dict>
-</plist>
diff --git a/bundles/CoffeeScriptBundle.tmbundle/Snippets/Ternary If.tmSnippet b/bundles/CoffeeScriptBundle.tmbundle/Snippets/Ternary If.tmSnippet
deleted file mode 100644
index 4f2465d36..000000000
--- a/bundles/CoffeeScriptBundle.tmbundle/Snippets/Ternary If.tmSnippet	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>if ${1:condition} then ${2:value} else ${3:other}</string>
-	<key>name</key>
-	<string>Ternary If</string>
-	<key>scope</key>
-	<string>source.coffee</string>
-	<key>tabTrigger</key>
-	<string>ifte</string>
-	<key>uuid</key>
-	<string>CF0B4684-E4CB-4E10-8C25-4D15400C3385</string>
-</dict>
-</plist>
diff --git a/bundles/CoffeeScriptBundle.tmbundle/Snippets/Try __ Catch.tmSnippet b/bundles/CoffeeScriptBundle.tmbundle/Snippets/Try __ Catch.tmSnippet
deleted file mode 100644
index 1b2415357..000000000
--- a/bundles/CoffeeScriptBundle.tmbundle/Snippets/Try __ Catch.tmSnippet	
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>try
-  $1
-catch ${2:error}
-  $3</string>
-	<key>name</key>
-	<string>Try .. Catch</string>
-	<key>scope</key>
-	<string>source.coffee</string>
-	<key>tabTrigger</key>
-	<string>try</string>
-	<key>uuid</key>
-	<string>CAFB0DED-5E23-4A84-AC20-87FBAF22DBAC</string>
-</dict>
-</plist>
diff --git a/bundles/CoffeeScriptBundle.tmbundle/Snippets/Unless.tmSnippet b/bundles/CoffeeScriptBundle.tmbundle/Snippets/Unless.tmSnippet
deleted file mode 100644
index 3691b0678..000000000
--- a/bundles/CoffeeScriptBundle.tmbundle/Snippets/Unless.tmSnippet
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>${1:action} unless ${2:condition}</string>
-	<key>name</key>
-	<string>Unless</string>
-	<key>scope</key>
-	<string>source.coffee</string>
-	<key>tabTrigger</key>
-	<string>unl</string>
-	<key>uuid</key>
-	<string>E561AECD-5933-4F59-A6F7-FA96E1203606</string>
-</dict>
-</plist>
diff --git a/bundles/CoffeeScriptBundle.tmbundle/Snippets/h1.tmSnippet b/bundles/CoffeeScriptBundle.tmbundle/Snippets/h1.tmSnippet
deleted file mode 100644
index 0ef035cbf..000000000
--- a/bundles/CoffeeScriptBundle.tmbundle/Snippets/h1.tmSnippet
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-  <key>content</key>
-  <string># $1
-# ==============================================================================
-$0</string>
-  <key>name</key>
-  <string>Subheader</string>
-  <key>scope</key>
-  <string>source.coffee</string>
-  <key>tabTrigger</key>
-  <string>/1</string>
-</dict>
-</plist>
diff --git a/bundles/CoffeeScriptBundle.tmbundle/Snippets/h2.tmSnippet b/bundles/CoffeeScriptBundle.tmbundle/Snippets/h2.tmSnippet
deleted file mode 100644
index ec571fef7..000000000
--- a/bundles/CoffeeScriptBundle.tmbundle/Snippets/h2.tmSnippet
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-  <key>content</key>
-  <string># $1
-# ----------------------------------------------------------------------
-$0</string>
-  <key>name</key>
-  <string>Subheader</string>
-  <key>scope</key>
-  <string>source.coffee</string>
-  <key>tabTrigger</key>
-  <string>/2</string>
-</dict>
-</plist>
diff --git a/bundles/CoffeeScriptBundle.tmbundle/Snippets/h3.tmSnippet b/bundles/CoffeeScriptBundle.tmbundle/Snippets/h3.tmSnippet
deleted file mode 100644
index 2bb8ad0a1..000000000
--- a/bundles/CoffeeScriptBundle.tmbundle/Snippets/h3.tmSnippet
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-  <key>content</key>
-  <string># $1
-# -------------------------
-$0</string>
-  <key>name</key>
-  <string>Subheader</string>
-  <key>scope</key>
-  <string>source.coffee</string>
-  <key>tabTrigger</key>
-  <string>/3</string>
-</dict>
-</plist>
diff --git a/bundles/CoffeeScriptBundle.tmbundle/Snippets/log.tmSnippet b/bundles/CoffeeScriptBundle.tmbundle/Snippets/log.tmSnippet
deleted file mode 100644
index 33e7add5e..000000000
--- a/bundles/CoffeeScriptBundle.tmbundle/Snippets/log.tmSnippet
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>console.log $0</string>
-	<key>name</key>
-	<string>log</string>
-	<key>scope</key>
-	<string>source.coffee</string>
-	<key>tabTrigger</key>
-	<string>log</string>
-	<key>uuid</key>
-	<string>FBC44B18-323A-4C00-A35B-15E41830C5AD</string>
-</dict>
-</plist>
diff --git a/bundles/CoffeeScriptBundle.tmbundle/Snippets/require.tmSnippet b/bundles/CoffeeScriptBundle.tmbundle/Snippets/require.tmSnippet
deleted file mode 100644
index 27f7aa7a5..000000000
--- a/bundles/CoffeeScriptBundle.tmbundle/Snippets/require.tmSnippet
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>${2/^.*?([\w_]+).*$/\L$1/} = require ${2:'${1:sys}'}$3</string>
-	<key>name</key>
-	<string>require</string>
-	<key>scope</key>
-	<string>source.coffee</string>
-	<key>tabTrigger</key>
-	<string>req</string>
-	<key>uuid</key>
-	<string>8A65E175-18F2-428F-A695-73E01139E41A</string>
-</dict>
-</plist>
diff --git a/bundles/CoffeeScriptBundle.tmbundle/Syntaxes/CoffeeScript.tmLanguage b/bundles/CoffeeScriptBundle.tmbundle/Syntaxes/CoffeeScript.tmLanguage
deleted file mode 100644
index 461e86744..000000000
--- a/bundles/CoffeeScriptBundle.tmbundle/Syntaxes/CoffeeScript.tmLanguage
+++ /dev/null
@@ -1,736 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>comment</key>
-	<string>CoffeeScript Syntax: version 1</string>
-	<key>fileTypes</key>
-	<array>
-		<string>coffee</string>
-		<string>Cakefile</string>
-		<string>coffee.erb</string>
-	</array>
-	<key>firstLineMatch</key>
-	<string>^#!.*\bcoffee</string>
-	<key>foldingStartMarker</key>
-	<string>^\s*class\s+\S.*$|.*(-&gt;|=&gt;)\s*$|.*[\[{]\s*$</string>
-	<key>foldingStopMarker</key>
-	<string>^\s*$|^\s*[}\]]\s*$</string>
-	<key>keyEquivalent</key>
-	<string>^~C</string>
-	<key>name</key>
-	<string>CoffeeScript</string>
-	<key>patterns</key>
-	<array>
-		<dict>
-			<key>captures</key>
-			<dict>
-				<key>1</key>
-				<dict>
-					<key>name</key>
-					<string>variable.parameter.function.coffee</string>
-				</dict>
-				<key>2</key>
-				<dict>
-					<key>name</key>
-					<string>storage.type.function.coffee</string>
-				</dict>
-			</dict>
-			<key>comment</key>
-			<string>match stuff like: a -&gt; … </string>
-			<key>match</key>
-			<string>(\([^()]*?\))\s*([=-]&gt;)</string>
-			<key>name</key>
-			<string>meta.inline.function.coffee</string>
-		</dict>
-		<dict>
-			<key>captures</key>
-			<dict>
-				<key>1</key>
-				<dict>
-					<key>name</key>
-					<string>keyword.operator.new.coffee</string>
-				</dict>
-				<key>2</key>
-				<dict>
-					<key>name</key>
-					<string>entity.name.type.instance.coffee</string>
-				</dict>
-			</dict>
-			<key>match</key>
-			<string>(new)\s+(\w+(?:\.\w*)*)</string>
-			<key>name</key>
-			<string>meta.class.instance.constructor</string>
-		</dict>
-		<dict>
-			<key>begin</key>
-			<string>'''</string>
-			<key>beginCaptures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.begin.coffee</string>
-				</dict>
-			</dict>
-			<key>end</key>
-			<string>'''</string>
-			<key>endCaptures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.end.coffee</string>
-				</dict>
-			</dict>
-			<key>name</key>
-			<string>string.quoted.heredoc.coffee</string>
-		</dict>
-		<dict>
-			<key>begin</key>
-			<string>"""</string>
-			<key>beginCaptures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.begin.coffee</string>
-				</dict>
-			</dict>
-			<key>end</key>
-			<string>"""</string>
-			<key>endCaptures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.end.coffee</string>
-				</dict>
-			</dict>
-			<key>name</key>
-			<string>string.quoted.double.heredoc.coffee</string>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>match</key>
-					<string>\\.</string>
-					<key>name</key>
-					<string>constant.character.escape.coffee</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>#interpolated_coffee</string>
-				</dict>
-			</array>
-		</dict>
-		<dict>
-			<key>begin</key>
-			<string>`</string>
-			<key>beginCaptures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.begin.coffee</string>
-				</dict>
-			</dict>
-			<key>end</key>
-			<string>`</string>
-			<key>endCaptures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.end.coffee</string>
-				</dict>
-			</dict>
-			<key>name</key>
-			<string>string.quoted.script.coffee</string>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>match</key>
-					<string>\\(x\h{2}|[0-2][0-7]{,2}|3[0-6][0-7]|37[0-7]?|[4-7][0-7]?|.)</string>
-					<key>name</key>
-					<string>constant.character.escape.coffee</string>
-				</dict>
-			</array>
-		</dict>
-		<dict>
-			<key>begin</key>
-			<string>(?&lt;!#)###(?!#)</string>
-			<key>captures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.comment.coffee</string>
-				</dict>
-			</dict>
-			<key>end</key>
-			<string>###(?:[ \t]*\n)</string>
-			<key>name</key>
-			<string>comment.block.coffee</string>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>match</key>
-					<string>@\w*</string>
-					<key>name</key>
-					<string>storage.type.annotation.coffeescript</string>
-				</dict>
-			</array>
-		</dict>
-		<dict>
-			<key>captures</key>
-			<dict>
-				<key>1</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.comment.coffee</string>
-				</dict>
-			</dict>
-			<key>match</key>
-			<string>(#)(?!\{).*$\n?</string>
-			<key>name</key>
-			<string>comment.line.number-sign.coffee</string>
-		</dict>
-		<dict>
-			<key>begin</key>
-			<string>/{3}</string>
-			<key>end</key>
-			<string>/{3}[imgy]{0,4}</string>
-			<key>name</key>
-			<string>string.regexp.coffee</string>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>include</key>
-					<string>#interpolated_coffee</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>#embedded_comment</string>
-				</dict>
-			</array>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>/(?![\s=/*+{}?]).*?[^\\]/[igmy]{0,4}(?![a-zA-Z0-9])</string>
-			<key>name</key>
-			<string>string.regexp.coffee</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>(?x)
-				\b(?&lt;![\.\$])(
-					break|by|catch|continue|else|finally|for|in|of|if|return|switch|
-					then|throw|try|unless|when|while|until|loop|do|(?&lt;=for)\s+own
-				)(?!\s*:)\b
-			</string>
-			<key>name</key>
-			<string>keyword.control.coffee</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>(?x)
-				and=|or=|!|%|&amp;|\^|\*|\/|(\-)?\-(?!&gt;)|\+\+|\+|~|==|=(?!&gt;)|!=|&lt;=|&gt;=|&lt;&lt;=|&gt;&gt;=|
-				&gt;&gt;&gt;=|&lt;&gt;|&lt;|&gt;|!|&amp;&amp;|\.\.(\.)?|\?|\||\|\||\:|\*=|(?&lt;!\()/=|%=|\+=|\-=|&amp;=|
-				\^=|\b(?&lt;![\.\$])(instanceof|new|delete|typeof|and|or|is|isnt|not)\b
-			</string>
-			<key>name</key>
-			<string>keyword.operator.coffee</string>
-		</dict>
-		<dict>
-			<key>captures</key>
-			<dict>
-				<key>1</key>
-				<dict>
-					<key>name</key>
-					<string>variable.assignment.coffee</string>
-				</dict>
-				<key>4</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.separator.key-value</string>
-				</dict>
-				<key>5</key>
-				<dict>
-					<key>name</key>
-					<string>keyword.operator.coffee</string>
-				</dict>
-			</dict>
-			<key>match</key>
-			<string>([a-zA-Z\$_](\w|\$|\.)*\s*(?!\::)((:)|(=))(?!(\s*\(.*\))?\s*((=|-)&gt;)))</string>
-			<key>name</key>
-			<string>variable.assignment.coffee</string>
-		</dict>
-		<dict>
-			<key>begin</key>
-			<string>(?&lt;=\s|^)([\[\{])(?=.*?[\]\}]\s+[:=])</string>
-			<key>beginCaptures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>keyword.operator.coffee</string>
-				</dict>
-			</dict>
-			<key>end</key>
-			<string>([\]\}]\s*[:=])</string>
-			<key>endCaptures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>keyword.operator.coffee</string>
-				</dict>
-			</dict>
-			<key>name</key>
-			<string>meta.variable.assignment.destructured.coffee</string>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>include</key>
-					<string>#variable_name</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>#instance_variable</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>#single_quoted_string</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>#double_quoted_string</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>#numeric</string>
-				</dict>
-			</array>
-		</dict>
-		<dict>
-			<key>captures</key>
-			<dict>
-				<key>2</key>
-				<dict>
-					<key>name</key>
-					<string>entity.name.function.coffee</string>
-				</dict>
-				<key>3</key>
-				<dict>
-					<key>name</key>
-					<string>entity.name.function.coffee</string>
-				</dict>
-				<key>4</key>
-				<dict>
-					<key>name</key>
-					<string>variable.parameter.function.coffee</string>
-				</dict>
-				<key>5</key>
-				<dict>
-					<key>name</key>
-					<string>storage.type.function.coffee</string>
-				</dict>
-			</dict>
-			<key>match</key>
-			<string>(?x)
-				(\s*)
-				(?=[a-zA-Z\$_])
-				(
-					[a-zA-Z\$_](\w|\$|:|\.)*\s*
-					(?=[:=](\s*\(.*\))?\s*([=-]&gt;))
-				)
-			</string>
-			<key>name</key>
-			<string>meta.function.coffee</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>[=-]&gt;</string>
-			<key>name</key>
-			<string>storage.type.function.coffee</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>\b(?&lt;!\.)(true|on|yes)(?!\s*[:=])\b</string>
-			<key>name</key>
-			<string>constant.language.boolean.true.coffee</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>\b(?&lt;!\.)(false|off|no)(?!\s*[:=])\b</string>
-			<key>name</key>
-			<string>constant.language.boolean.false.coffee</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>\b(?&lt;!\.)null(?!\s*[:=])\b</string>
-			<key>name</key>
-			<string>constant.language.null.coffee</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>\b(?&lt;!\.)(super|this|extends)(?!\s*[:=])\b</string>
-			<key>name</key>
-			<string>variable.language.coffee</string>
-		</dict>
-		<dict>
-			<key>captures</key>
-			<dict>
-				<key>1</key>
-				<dict>
-					<key>name</key>
-					<string>storage.type.class.coffee</string>
-				</dict>
-				<key>2</key>
-				<dict>
-					<key>name</key>
-					<string>entity.name.type.class.coffee</string>
-				</dict>
-				<key>3</key>
-				<dict>
-					<key>name</key>
-					<string>keyword.control.inheritance.coffee</string>
-				</dict>
-				<key>4</key>
-				<dict>
-					<key>name</key>
-					<string>entity.other.inherited-class.coffee</string>
-				</dict>
-			</dict>
-			<key>match</key>
-			<string>(class\b)\s+(@?[a-zA-Z\$_][\w\.]*)?(?:\s+(extends)\s+(@?[a-zA-Z\$\._][\w\.]*))?</string>
-			<key>name</key>
-			<string>meta.class.coffee</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>\b(debugger|\\)\b</string>
-			<key>name</key>
-			<string>keyword.other.coffee</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>(?x)\b(
-				Array|ArrayBuffer|Blob|Boolean|Date|document|event|Function|
-				Int(8|16|32|64)Array|Math|Map|Number|
-				Object|Proxy|RegExp|Set|String|WeakMap|
-				window|Uint(8|16|32|64)Array|XMLHttpRequest
-			)\b</string>
-			<key>name</key>
-			<string>support.class.coffee</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>\b(console)\b</string>
-			<key>name</key>
-			<string>entity.name.type.object.coffee</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>((?&lt;=console\.)(debug|warn|info|log|error|time|timeEnd|assert))\b</string>
-			<key>name</key>
-			<string>support.function.console.coffee</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>(?x)\b(
-				decodeURI(Component)?|encodeURI(Component)?|eval|parse(Float|Int)|require
-			)\b</string>
-			<key>name</key>
-			<string>support.function.coffee</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>(?x)((?&lt;=\.)(
-				apply|call|concat|every|filter|forEach|from|hasOwnProperty|indexOf|
-				isPrototypeOf|join|lastIndexOf|map|of|pop|propertyIsEnumerable|push|
-				reduce(Right)?|reverse|shift|slice|some|sort|splice|to(Locale)?String|
-				unshift|valueOf
-			))\b</string>
-			<key>name</key>
-			<string>support.function.method.array.coffee</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>(?x)((?&lt;=Array\.)(
-				isArray
-			))\b</string>
-			<key>name</key>
-			<string>support.function.static.array.coffee</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>(?x)((?&lt;=Object\.)(
-				create|definePropert(ies|y)|freeze|getOwnProperty(Descriptors?|Names)|
-				getProperty(Descriptor|Names)|getPrototypeOf|is(Extensible|Frozen|Sealed)?|
-				isnt|keys|preventExtensions|seal
-			))\b</string>
-			<key>name</key>
-			<string>support.function.static.object.coffee</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>(?x)((?&lt;=Math\.)(
-				abs|acos|acosh|asin|asinh|atan|atan2|atanh|ceil|cos|cosh|exp|expm1|floor|
-				hypot|log|log10|log1p|log2|max|min|pow|random|round|sign|sin|sinh|sqrt|
-				tan|tanh|trunc
-			))\b</string>
-			<key>name</key>
-			<string>support.function.static.math.coffee</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>(?x)((?&lt;=Number\.)(
-				is(Finite|Integer|NaN)|toInteger
-			))\b</string>
-			<key>name</key>
-			<string>support.function.static.number.coffee</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>\b(Infinity|NaN|undefined)\b</string>
-			<key>name</key>
-			<string>constant.language.coffee</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>\;</string>
-			<key>name</key>
-			<string>punctuation.terminator.statement.coffee</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>,[ |\t]*</string>
-			<key>name</key>
-			<string>meta.delimiter.object.comma.coffee</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>\.</string>
-			<key>name</key>
-			<string>meta.delimiter.method.period.coffee</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>\{|\}</string>
-			<key>name</key>
-			<string>meta.brace.curly.coffee</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>\(|\)</string>
-			<key>name</key>
-			<string>meta.brace.round.coffee</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>\[|\]\s*</string>
-			<key>name</key>
-			<string>meta.brace.square.coffee</string>
-		</dict>
-		<dict>
-			<key>include</key>
-			<string>#instance_variable</string>
-		</dict>
-		<dict>
-			<key>include</key>
-			<string>#single_quoted_string</string>
-		</dict>
-		<dict>
-			<key>include</key>
-			<string>#double_quoted_string</string>
-		</dict>
-		<dict>
-			<key>include</key>
-			<string>#numeric</string>
-		</dict>
-	</array>
-	<key>repository</key>
-	<dict>
-		<key>double_quoted_string</key>
-		<dict>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>begin</key>
-					<string>"</string>
-					<key>beginCaptures</key>
-					<dict>
-						<key>0</key>
-						<dict>
-							<key>name</key>
-							<string>punctuation.definition.string.begin.coffee</string>
-						</dict>
-					</dict>
-					<key>end</key>
-					<string>"</string>
-					<key>endCaptures</key>
-					<dict>
-						<key>0</key>
-						<dict>
-							<key>name</key>
-							<string>punctuation.definition.string.end.coffee</string>
-						</dict>
-					</dict>
-					<key>name</key>
-					<string>string.quoted.double.coffee</string>
-					<key>patterns</key>
-					<array>
-						<dict>
-							<key>match</key>
-							<string>\\(x\h{2}|[0-2][0-7]{,2}|3[0-6][0-7]|37[0-7]?|[4-7][0-7]?|.)</string>
-							<key>name</key>
-							<string>constant.character.escape.coffee</string>
-						</dict>
-						<dict>
-							<key>include</key>
-							<string>#interpolated_coffee</string>
-						</dict>
-					</array>
-				</dict>
-			</array>
-		</dict>
-		<key>embedded_comment</key>
-		<dict>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>captures</key>
-					<dict>
-						<key>1</key>
-						<dict>
-							<key>name</key>
-							<string>punctuation.definition.comment.coffee</string>
-						</dict>
-					</dict>
-					<key>match</key>
-					<string>(?&lt;!\\)(#).*$\n?</string>
-					<key>name</key>
-					<string>comment.line.number-sign.coffee</string>
-				</dict>
-			</array>
-		</dict>
-		<key>instance_variable</key>
-		<dict>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>match</key>
-					<string>(@)([a-zA-Z_\$]\w*)?</string>
-					<key>name</key>
-					<string>variable.other.readwrite.instance.coffee</string>
-				</dict>
-			</array>
-		</dict>
-		<key>interpolated_coffee</key>
-		<dict>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>begin</key>
-					<string>\#\{</string>
-					<key>captures</key>
-					<dict>
-						<key>0</key>
-						<dict>
-							<key>name</key>
-							<string>punctuation.section.embedded.coffee</string>
-						</dict>
-					</dict>
-					<key>end</key>
-					<string>\}</string>
-					<key>name</key>
-					<string>source.coffee.embedded.source</string>
-					<key>patterns</key>
-					<array>
-						<dict>
-							<key>include</key>
-							<string>$self</string>
-						</dict>
-					</array>
-				</dict>
-			</array>
-		</dict>
-		<key>numeric</key>
-		<dict>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>match</key>
-					<string>(?&lt;!\$)\b((0([box])[0-9a-fA-F]+)|([0-9]+(\.[0-9]+)?(e[+\-]?[0-9]+)?))\b</string>
-					<key>name</key>
-					<string>constant.numeric.coffee</string>
-				</dict>
-			</array>
-		</dict>
-		<key>single_quoted_string</key>
-		<dict>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>begin</key>
-					<string>'</string>
-					<key>beginCaptures</key>
-					<dict>
-						<key>0</key>
-						<dict>
-							<key>name</key>
-							<string>punctuation.definition.string.begin.coffee</string>
-						</dict>
-					</dict>
-					<key>end</key>
-					<string>'</string>
-					<key>endCaptures</key>
-					<dict>
-						<key>0</key>
-						<dict>
-							<key>name</key>
-							<string>punctuation.definition.string.end.coffee</string>
-						</dict>
-					</dict>
-					<key>name</key>
-					<string>string.quoted.single.coffee</string>
-					<key>patterns</key>
-					<array>
-						<dict>
-							<key>match</key>
-							<string>\\(x\h{2}|[0-2][0-7]{,2}|3[0-6][0-7]?|37[0-7]?|[4-7][0-7]?|.)</string>
-							<key>name</key>
-							<string>constant.character.escape.coffee</string>
-						</dict>
-					</array>
-				</dict>
-			</array>
-		</dict>
-		<key>variable_name</key>
-		<dict>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>captures</key>
-					<dict>
-						<key>1</key>
-						<dict>
-							<key>name</key>
-							<string>variable.assignment.coffee</string>
-						</dict>
-					</dict>
-					<key>match</key>
-					<string>([a-zA-Z\$_]\w*(\.\w+)*)</string>
-					<key>name</key>
-					<string>variable.assignment.coffee</string>
-				</dict>
-			</array>
-		</dict>
-	</dict>
-	<key>scopeName</key>
-	<string>source.coffee</string>
-	<key>uuid</key>
-	<string>5B520980-A7D5-4E10-8582-1A4C889A8DE5</string>
-</dict>
-</plist>
diff --git a/bundles/CoffeeScriptBundle.tmbundle/info.plist b/bundles/CoffeeScriptBundle.tmbundle/info.plist
deleted file mode 100644
index c2d0c4469..000000000
--- a/bundles/CoffeeScriptBundle.tmbundle/info.plist
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>mainMenu</key>
-	<dict>
-		<key>items</key>
-		<array>
-			<string>D77D67C9-7BA6-4B42-A563-2E2416DEEB53</string>
-			<string>E11D7545-67B4-4191-8012-756E2C9AD382</string>
-			<string>5786C9CC-C7ED-46FA-9D0B-069E52DAF268</string>
-			<string>1C7FD768-1DEA-4825-8220-FACA8D507E80</string>
-		</array>
-		<key>submenus</key>
-		<dict>
-			<key>1C7FD768-1DEA-4825-8220-FACA8D507E80</key>
-			<dict>
-				<key>items</key>
-				<array>
-					<string>F08537AF-4F02-4040-999D-F0785CF64C02</string>
-					<string>C4F99E3D-1540-4BC1-8038-0A19D65BABC8</string>
-					<string>68A86250-0280-11E0-A976-0800200C9A66</string>
-					<string>EE3293A5-3761-40BD-9CA8-DAAA176AA19E</string>
-					<string>422A59E7-FC36-4E99-B01C-6353515BB544</string>
-					<string>8A65E175-18F2-428F-A695-73E01139E41A</string>
-					<string>C04ED189-6ACB-44E6-AD5B-911B760AD1CC</string>
-					<string>FBC44B18-323A-4C00-A35B-15E41830C5AD</string>
-				</array>
-				<key>name</key>
-				<string>Other</string>
-			</dict>
-			<key>5786C9CC-C7ED-46FA-9D0B-069E52DAF268</key>
-			<dict>
-				<key>items</key>
-				<array>
-					<string>192428A1-8684-4172-8728-225B4C9E532F</string>
-					<string>F2E2E79A-A85D-471D-9847-72AE40205942</string>
-					<string>20BDC055-ED67-4D0E-A47F-ADAA828EFF2B</string>
-					<string>2D4AC0B4-47AA-4E38-9A11-09A48C2A9439</string>
-					<string>9D126CC5-EA14-4A40-B6D3-6A5FC1AC1420</string>
-					<string>FA6AB9BF-3444-4A8C-B010-C95C2CF5BAB3</string>
-					<string>E0F8E45A-9262-4DD6-ADFF-B5B9D6CE99C2</string>
-					<string>3931A7C6-F1FB-484F-82D1-26F5A8F779D0</string>
-					<string>765ACBD3-380A-4CF8-9111-345A36A0DAE7</string>
-					<string>CAFB0DED-5E23-4A84-AC20-87FBAF22DBAC</string>
-				</array>
-				<key>name</key>
-				<string>Constructs</string>
-			</dict>
-			<key>D77D67C9-7BA6-4B42-A563-2E2416DEEB53</key>
-			<dict>
-				<key>items</key>
-				<array>
-					<string>30395DAB-44A6-44F7-99E1-02D64621303A</string>
-					<string>D749F761-1740-4918-9490-90DF376BA72E</string>
-					<string>90424631-D00B-448C-B157-DAC92DFB2858</string>
-				</array>
-				<key>name</key>
-				<string>Run</string>
-			</dict>
-			<key>E11D7545-67B4-4191-8012-756E2C9AD382</key>
-			<dict>
-				<key>items</key>
-				<array>
-					<string>F4FDFB3A-71EF-48A4-93F4-178B949546B1</string>
-					<string>2AD19F12-E499-4715-9A47-FC8D594BC550</string>
-					<string>EA8F5EDB-6E1E-4C36-9CA5-12B108F1A7C9</string>
-					<string>CF0B4684-E4CB-4E10-8C25-4D15400C3385</string>
-					<string>E561AECD-5933-4F59-A6F7-FA96E1203606</string>
-				</array>
-				<key>name</key>
-				<string>Control</string>
-			</dict>
-		</dict>
-	</dict>
-	<key>name</key>
-	<string>CoffeeScript</string>
-	<key>ordering</key>
-	<array>
-		<string>5B520980-A7D5-4E10-8582-1A4C889A8DE5</string>
-		<string>0A92C6F6-4D73-4859-B38C-4CC19CBC191F</string>
-		<string>419D24D8-0DD6-4D9A-8CA0-6D9CD740BEEC</string>
-		<string>B087AF2F-8946-4EA9-8409-49E7C4A2EEF0</string>
-		<string>C5D6C716-12FE-4CE8-A916-6CABEDE8AFE7</string>
-		<string>EE3293A5-3761-40BD-9CA8-DAAA176AA19E</string>
-		<string>192428A1-8684-4172-8728-225B4C9E532F</string>
-		<string>30395DAB-44A6-44F7-99E1-02D64621303A</string>
-		<string>D749F761-1740-4918-9490-90DF376BA72E</string>
-		<string>90424631-D00B-448C-B157-DAC92DFB2858</string>
-		<string>F08537AF-4F02-4040-999D-F0785CF64C02</string>
-		<string>C4F99E3D-1540-4BC1-8038-0A19D65BABC8</string>
-		<string>F2E2E79A-A85D-471D-9847-72AE40205942</string>
-		<string>20BDC055-ED67-4D0E-A47F-ADAA828EFF2B</string>
-		<string>F4FDFB3A-71EF-48A4-93F4-178B949546B1</string>
-		<string>2AD19F12-E499-4715-9A47-FC8D594BC550</string>
-		<string>EA8F5EDB-6E1E-4C36-9CA5-12B108F1A7C9</string>
-		<string>CF0B4684-E4CB-4E10-8C25-4D15400C3385</string>
-		<string>E561AECD-5933-4F59-A6F7-FA96E1203606</string>
-		<string>2D4AC0B4-47AA-4E38-9A11-09A48C2A9439</string>
-		<string>9D126CC5-EA14-4A40-B6D3-6A5FC1AC1420</string>
-		<string>FA6AB9BF-3444-4A8C-B010-C95C2CF5BAB3</string>
-		<string>E0F8E45A-9262-4DD6-ADFF-B5B9D6CE99C2</string>
-		<string>3931A7C6-F1FB-484F-82D1-26F5A8F779D0</string>
-		<string>765ACBD3-380A-4CF8-9111-345A36A0DAE7</string>
-		<string>CAFB0DED-5E23-4A84-AC20-87FBAF22DBAC</string>
-		<string>422A59E7-FC36-4E99-B01C-6353515BB544</string>
-		<string>8A65E175-18F2-428F-A695-73E01139E41A</string>
-		<string>C04ED189-6ACB-44E6-AD5B-911B760AD1CC</string>
-		<string>FBC44B18-323A-4C00-A35B-15E41830C5AD</string>
-	</array>
-	<key>uuid</key>
-	<string>A46E4382-F1AC-405B-8F22-65FF470F34D7</string>
-</dict>
-</plist>
diff --git a/bundles/Readme.md b/bundles/Readme.md
new file mode 100644
index 000000000..3a6e9c1e6
--- /dev/null
+++ b/bundles/Readme.md
@@ -0,0 +1 @@
+For best results use bundles from https://github.com/textmate
diff --git a/bundles/css.tmbundle/Commands/CodeCompletion CSS 2.tmCommand b/bundles/css.tmbundle/Commands/CodeCompletion CSS 2.tmCommand
deleted file mode 100644
index ab1a5cabf..000000000
--- a/bundles/css.tmbundle/Commands/CodeCompletion CSS 2.tmCommand	
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>bundleUUID</key>
-	<string>467B298F-6227-11D9-BFB1-000D93589AF6</string>
-	<key>command</key>
-	<string>#!/usr/bin/env ruby
-require "#{ENV['TM_SUPPORT_PATH']}/lib/codecompletion"
-preference = 'Completions'
-choices = []
-
-parsed_choices = TextmateCompletionsParser.new(nil, :scope =&gt; :css).to_ary
-choices += parsed_choices if parsed_choices
-
-choices += ['--']
-
-plist_choices = TextmateCompletionsPlist.new( "#{ENV['TM_BUNDLE_PATH']}/Preferences/#{preference}.tmPreferences" ).to_ary
-choices += plist_choices if plist_choices
-
-print TextmateCodeCompletion.new(choices,STDIN.read, :scope =&gt; :css).to_snippet
-</string>
-	<key>fallbackInput</key>
-	<string>line</string>
-	<key>input</key>
-	<string>selection</string>
-	<key>keyEquivalent</key>
-	<string>~</string>
-	<key>name</key>
-	<string>CodeCompletion CSS</string>
-	<key>output</key>
-	<string>insertAsSnippet</string>
-	<key>scope</key>
-	<string>source.css -meta.property-list</string>
-	<key>uuid</key>
-	<string>E6FB4209-818E-40F5-9AFF-96E204F52A11</string>
-</dict>
-</plist>
diff --git a/bundles/css.tmbundle/Commands/CodeCompletion CSS Property Values.tmCommand b/bundles/css.tmbundle/Commands/CodeCompletion CSS Property Values.tmCommand
deleted file mode 100644
index 7bb564007..000000000
--- a/bundles/css.tmbundle/Commands/CodeCompletion CSS Property Values.tmCommand	
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>bundleUUID</key>
-	<string>467B298F-6227-11D9-BFB1-000D93589AF6</string>
-	<key>command</key>
-	<string>#!/usr/bin/env ruby
-require "#{ENV['TM_SUPPORT_PATH']}/lib/codecompletion"
-preference = 'Property Value Completions'
-choices = []
-
-parsed_choices = TextmateCompletionsParser.new(nil, :scope =&gt; :css_values).to_ary
-choices += parsed_choices if parsed_choices
-
-choices += ['--']
-
-plist_choices = TextmateCompletionsPlist.new( "#{ENV['TM_BUNDLE_PATH']}/Preferences/#{preference}.tmPreferences" ).to_ary
-choices += plist_choices if plist_choices
-
-print TextmateCodeCompletion.new(choices,STDIN.read).to_snippet
-</string>
-	<key>fallbackInput</key>
-	<string>line</string>
-	<key>input</key>
-	<string>selection</string>
-	<key>keyEquivalent</key>
-	<string>~</string>
-	<key>name</key>
-	<string>CodeCompletion CSS Property Values</string>
-	<key>output</key>
-	<string>insertAsSnippet</string>
-	<key>scope</key>
-	<string>source.css meta.property-value</string>
-	<key>uuid</key>
-	<string>35DFB6D6-E48B-4907-9030-019904DA0C5B</string>
-</dict>
-</plist>
diff --git a/bundles/css.tmbundle/Commands/CodeCompletion CSS.tmCommand b/bundles/css.tmbundle/Commands/CodeCompletion CSS.tmCommand
deleted file mode 100644
index 8d0868173..000000000
--- a/bundles/css.tmbundle/Commands/CodeCompletion CSS.tmCommand	
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>bundleUUID</key>
-	<string>467B298F-6227-11D9-BFB1-000D93589AF6</string>
-	<key>command</key>
-	<string>#!/usr/bin/env ruby
-require "#{ENV['TM_SUPPORT_PATH']}/lib/codecompletion"
-TextmateCodeCompletion.plist('Property Completions')
-</string>
-	<key>fallbackInput</key>
-	<string>line</string>
-	<key>input</key>
-	<string>selection</string>
-	<key>keyEquivalent</key>
-	<string>~</string>
-	<key>name</key>
-	<string>CodeCompletion CSS Properties</string>
-	<key>output</key>
-	<string>insertAsSnippet</string>
-	<key>scope</key>
-	<string>source.css meta.property-list -meta.property-value, source.css meta.property-value punctuation.separator.key-value</string>
-	<key>uuid</key>
-	<string>42E26C97-72AB-4953-807F-645AF7EDF59F</string>
-</dict>
-</plist>
diff --git a/bundles/css.tmbundle/Commands/Documentation for Property.plist b/bundles/css.tmbundle/Commands/Documentation for Property.plist
deleted file mode 100644
index af49ff2d7..000000000
--- a/bundles/css.tmbundle/Commands/Documentation for Property.plist	
+++ /dev/null
@@ -1,182 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>command</key>
-	<string>#!/usr/bin/env ruby
-#
-# Lookup current word as a CSS property on w3c.org
-#
-# The mapping below was generated using:
-# echo '$props = {'; curl -s http://www.w3.org/TR/CSS2/propidx.html|egrep "(^|&lt;tr&gt;&lt;td&gt;)&lt;a href=\".*\" class=\"noxref\"&gt;&lt;span class=\".*\"&gt;'.*'&lt;/span&gt;&lt;/a&gt;"|perl -pe "s|(?:&lt;tr&gt;&lt;td&gt;)?&lt;a href=\"(.*)\" class=\"noxref\"&gt;&lt;span class=\".*\"&gt;'(.*)'&lt;/span&gt;&lt;/a&gt;|\t\"\$2\"\t=&gt; \"\$1\",|"; echo '}'
-
-$props = {
-	"azimuth"	=&gt; "aural.html#propdef-azimuth",
-	"background"	=&gt; "colors.html#propdef-background",
-	"background-attachment"	=&gt; "colors.html#propdef-background-attachment",
-	"background-color"	=&gt; "colors.html#propdef-background-color",
-	"background-image"	=&gt; "colors.html#propdef-background-image",
-	"background-position"	=&gt; "colors.html#propdef-background-position",
-	"background-repeat"	=&gt; "colors.html#propdef-background-repeat",
-	"border"	=&gt; "box.html#propdef-border",
-	"border-collapse"	=&gt; "tables.html#propdef-border-collapse",
-	"border-color"	=&gt; "box.html#propdef-border-color",
-	"border-spacing"	=&gt; "tables.html#propdef-border-spacing",
-	"border-style"	=&gt; "box.html#propdef-border-style",
-	"border-top"	=&gt; "box.html#propdef-border-top",
-	"border-right"	=&gt; "box.html#propdef-border-right",
-	"border-bottom"	=&gt; "box.html#propdef-border-bottom",
-	"border-left"	=&gt; "box.html#propdef-border-left",
-	"border-top-color"	=&gt; "box.html#propdef-border-top-color",
-	"border-right-color"	=&gt; "box.html#propdef-border-right-color",
-	"border-bottom-color"	=&gt; "box.html#propdef-border-bottom-color",
-	"border-left-color"	=&gt; "box.html#propdef-border-left-color",
-	"border-top-style"	=&gt; "box.html#propdef-border-top-style",
-	"border-right-style"	=&gt; "box.html#propdef-border-right-style",
-	"border-bottom-style"	=&gt; "box.html#propdef-border-bottom-style",
-	"border-left-style"	=&gt; "box.html#propdef-border-left-style",
-	"border-top-width"	=&gt; "box.html#propdef-border-top-width",
-	"border-right-width"	=&gt; "box.html#propdef-border-right-width",
-	"border-bottom-width"	=&gt; "box.html#propdef-border-bottom-width",
-	"border-left-width"	=&gt; "box.html#propdef-border-left-width",
-	"border-width"	=&gt; "box.html#propdef-border-width",
-	"bottom"	=&gt; "visuren.html#propdef-bottom",
-	"caption-side"	=&gt; "tables.html#propdef-caption-side",
-	"clear"	=&gt; "visuren.html#propdef-clear",
-	"clip"	=&gt; "visufx.html#propdef-clip",
-	"color"	=&gt; "colors.html#propdef-color",
-	"content"	=&gt; "generate.html#propdef-content",
-	"counter-increment"	=&gt; "generate.html#propdef-counter-increment",
-	"counter-reset"	=&gt; "generate.html#propdef-counter-reset",
-	"cue"	=&gt; "aural.html#propdef-cue",
-	"cue-after"	=&gt; "aural.html#propdef-cue-after",
-	"cue-before"	=&gt; "aural.html#propdef-cue-before",
-	"cursor"	=&gt; "ui.html#propdef-cursor",
-	"direction"	=&gt; "visuren.html#propdef-direction",
-	"display"	=&gt; "visuren.html#propdef-display",
-	"elevation"	=&gt; "aural.html#propdef-elevation",
-	"empty-cells"	=&gt; "tables.html#propdef-empty-cells",
-	"float"	=&gt; "visuren.html#propdef-float",
-	"font"	=&gt; "fonts.html#propdef-font",
-	"font-family"	=&gt; "fonts.html#propdef-font-family",
-	"font-size"	=&gt; "fonts.html#propdef-font-size",
-	"font-size-adjust"	=&gt; "fonts.html#propdef-font-size-adjust",
-	"font-stretch"	=&gt; "fonts.html#propdef-font-stretch",
-	"font-style"	=&gt; "fonts.html#propdef-font-style",
-	"font-variant"	=&gt; "fonts.html#propdef-font-variant",
-	"font-weight"	=&gt; "fonts.html#propdef-font-weight",
-	"height"	=&gt; "visudet.html#propdef-height",
-	"left"	=&gt; "visuren.html#propdef-left",
-	"letter-spacing"	=&gt; "text.html#propdef-letter-spacing",
-	"line-height"	=&gt; "visudet.html#propdef-line-height",
-	"list-style"	=&gt; "generate.html#propdef-list-style",
-	"list-style-image"	=&gt; "generate.html#propdef-list-style-image",
-	"list-style-position"	=&gt; "generate.html#propdef-list-style-position",
-	"list-style-type"	=&gt; "generate.html#propdef-list-style-type",
-	"margin"	=&gt; "box.html#propdef-margin",
-	"margin-top"	=&gt; "box.html#propdef-margin-top",
-	"margin-right"	=&gt; "box.html#propdef-margin-right",
-	"margin-bottom"	=&gt; "box.html#propdef-margin-bottom",
-	"margin-left"	=&gt; "box.html#propdef-margin-left",
-	"marker-offset"	=&gt; "generate.html#propdef-marker-offset",
-	"marks"	=&gt; "page.html#propdef-marks",
-	"max-height"	=&gt; "visudet.html#propdef-max-height",
-	"max-width"	=&gt; "visudet.html#propdef-max-width",
-	"min-height"	=&gt; "visudet.html#propdef-min-height",
-	"min-width"	=&gt; "visudet.html#propdef-min-width",
-	"orphans"	=&gt; "page.html#propdef-orphans",
-	"outline"	=&gt; "ui.html#propdef-outline",
-	"outline-color"	=&gt; "ui.html#propdef-outline-color",
-	"outline-style"	=&gt; "ui.html#propdef-outline-style",
-	"outline-width"	=&gt; "ui.html#propdef-outline-width",
-	"overflow"	=&gt; "visufx.html#propdef-overflow",
-	"padding"	=&gt; "box.html#propdef-padding",
-	"padding-top"	=&gt; "box.html#propdef-padding-top",
-	"padding-right"	=&gt; "box.html#propdef-padding-right",
-	"padding-bottom"	=&gt; "box.html#propdef-padding-bottom",
-	"padding-left"	=&gt; "box.html#propdef-padding-left",
-	"page"	=&gt; "page.html#propdef-page",
-	"page-break-after"	=&gt; "page.html#propdef-page-break-after",
-	"page-break-before"	=&gt; "page.html#propdef-page-break-before",
-	"page-break-inside"	=&gt; "page.html#propdef-page-break-inside",
-	"pause"	=&gt; "aural.html#propdef-pause",
-	"pause-after"	=&gt; "aural.html#propdef-pause-after",
-	"pause-before"	=&gt; "aural.html#propdef-pause-before",
-	"pitch"	=&gt; "aural.html#propdef-pitch",
-	"pitch-range"	=&gt; "aural.html#propdef-pitch-range",
-	"play-during"	=&gt; "aural.html#propdef-play-during",
-	"position"	=&gt; "visuren.html#propdef-position",
-	"quotes"	=&gt; "generate.html#propdef-quotes",
-	"richness"	=&gt; "aural.html#propdef-richness",
-	"right"	=&gt; "visuren.html#propdef-right",
-	"size"	=&gt; "page.html#propdef-size",
-	"speak"	=&gt; "aural.html#propdef-speak",
-	"speak-header"	=&gt; "tables.html#propdef-speak-header",
-	"speak-numeral"	=&gt; "aural.html#propdef-speak-numeral",
-	"speak-punctuation"	=&gt; "aural.html#propdef-speak-punctuation",
-	"speech-rate"	=&gt; "aural.html#propdef-speech-rate",
-	"stress"	=&gt; "aural.html#propdef-stress",
-	"table-layout"	=&gt; "tables.html#propdef-table-layout",
-	"text-align"	=&gt; "text.html#propdef-text-align",
-	"text-decoration"	=&gt; "text.html#propdef-text-decoration",
-	"text-indent"	=&gt; "text.html#propdef-text-indent",
-	"text-shadow"	=&gt; "text.html#propdef-text-shadow",
-	"text-transform"	=&gt; "text.html#propdef-text-transform",
-	"top"	=&gt; "visuren.html#propdef-top",
-	"unicode-bidi"	=&gt; "visuren.html#propdef-unicode-bidi",
-	"vertical-align"	=&gt; "visudet.html#propdef-vertical-align",
-	"visibility"	=&gt; "visufx.html#propdef-visibility",
-	"voice-family"	=&gt; "aural.html#propdef-voice-family",
-	"volume"	=&gt; "aural.html#propdef-volume",
-	"white-space"	=&gt; "text.html#propdef-white-space",
-	"widows"	=&gt; "page.html#propdef-widows",
-	"width"	=&gt; "visudet.html#propdef-width",
-	"word-spacing"	=&gt; "text.html#propdef-word-spacing",
-	"z-index"	=&gt; "visuren.html#propdef-z-index",
-}
-
-cur_line = ENV['TM_CURRENT_LINE']
-cur_word = ENV['TM_CURRENT_WORD']
-
-# since dash (‘-’) is not a word character, extend current word to neighboring word and dash characters
-$prop_name = /[-\w]*#{Regexp.escape cur_word}[-\w]*/.match(cur_line)[0]
-
-def request_prop_name
-  s = `\"#{ENV['TM_SUPPORT_PATH']}/bin/CocoaDialog.app/Contents/MacOS/CocoaDialog\" inputbox --float --title 'Documentation for Property' --informative-text 'What property would you like to lookup?' --text '#{$prop_name}' --button1 'Lookup' --button2 'Cancel' --button3 'Show All Properties'`
-  case (a = s.split("\n"))[0].to_i
-    when 1 then $props[a[1].to_s] || "propidx.html"
-    when 2 then abort "&lt;script&gt;window.close()&lt;/script&gt;"
-    when 3 then "propidx.html"
-  end
-end
-
-prop_url = $props[$prop_name] || request_prop_name
-url = "http://www.w3.org/TR/CSS2/" + prop_url
-puts "&lt;meta http-equiv='Refresh' content='0;URL=#{url}'&gt;"
-</string>
-	<key>input</key>
-	<string>none</string>
-	<key>inputFormat</key>
-	<string>text</string>
-	<key>keyEquivalent</key>
-	<string>^h</string>
-	<key>name</key>
-	<string>Documentation for Property</string>
-	<key>outputCaret</key>
-	<string>afterOutput</string>
-	<key>outputFormat</key>
-	<string>html</string>
-	<key>outputLocation</key>
-	<string>newWindow</string>
-	<key>scope</key>
-	<string>source.css</string>
-	<key>semanticClass</key>
-	<string>lookup.define.css</string>
-	<key>uuid</key>
-	<string>50AA6E95-A754-4EBC-9C2A-68418C70D689</string>
-	<key>version</key>
-	<integer>2</integer>
-</dict>
-</plist>
diff --git a/bundles/css.tmbundle/Commands/Insert Color.plist b/bundles/css.tmbundle/Commands/Insert Color.plist
deleted file mode 100644
index 55efda94b..000000000
--- a/bundles/css.tmbundle/Commands/Insert Color.plist	
+++ /dev/null
@@ -1,204 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>hideFromUser</key>
-	<true/>
-	<key>command</key>
-	<string>#!/usr/bin/env ruby
-
-require ENV['TM_SUPPORT_PATH'] + "/lib/ui"
-require ENV['TM_SUPPORT_PATH'] + "/lib/exit_codes"
-colour = STDIN.read
-
-# http://www.w3schools.com/css/css_colornames.asp
-COLOURS = {
-  'aliceblue'            =&gt; 'F0F8FF',
-  'antiquewhite'         =&gt; 'FAEBD7',
-  'aqua'                 =&gt; '00FFFF',
-  'aquamarine'           =&gt; '7FFFD4',
-  'azure'                =&gt; 'F0FFFF',
-  'beige'                =&gt; 'F5F5DC',
-  'bisque'               =&gt; 'FFE4C4',
-  'black'                =&gt; '000000',
-  'blanchedalmond'       =&gt; 'FFEBCD',
-  'blue'                 =&gt; '0000FF',
-  'blueviolet'           =&gt; '8A2BE2',
-  'brown'                =&gt; 'A52A2A',
-  'burlywood'            =&gt; 'DEB887',
-  'cadetblue'            =&gt; '5F9EA0',
-  'chartreuse'           =&gt; '7FFF00',
-  'chocolate'            =&gt; 'D2691E',
-  'coral'                =&gt; 'FF7F50',
-  'cornflowerblue'       =&gt; '6495ED',
-  'cornsilk'             =&gt; 'FFF8DC',
-  'crimson'              =&gt; 'DC143C',
-  'cyan'                 =&gt; '00FFFF',
-  'darkblue'             =&gt; '00008B',
-  'darkcyan'             =&gt; '008B8B',
-  'darkgoldenrod'        =&gt; 'B8860B',
-  'darkgray'             =&gt; 'A9A9A9',
-  'darkgrey'             =&gt; 'A9A9A9',
-  'darkgreen'            =&gt; '006400',
-  'darkkhaki'            =&gt; 'BDB76B',
-  'darkmagenta'          =&gt; '8B008B',
-  'darkolivegreen'       =&gt; '556B2F',
-  'darkorange'           =&gt; 'FF8C00',
-  'darkorchid'           =&gt; '9932CC',
-  'darkred'              =&gt; '8B0000',
-  'darksalmon'           =&gt; 'E9967A',
-  'darkseagreen'         =&gt; '8FBC8F',
-  'darkslateblue'        =&gt; '483D8B',
-  'darkslategray'        =&gt; '2F4F4F',
-  'darkslategrey'        =&gt; '2F4F4F',
-  'darkturquoise'        =&gt; '00CED1',
-  'darkviolet'           =&gt; '9400D3',
-  'deeppink'             =&gt; 'FF1493',
-  'deepskyblue'          =&gt; '00BFFF',
-  'dimgray'              =&gt; '696969',
-  'dimgrey'              =&gt; '696969',
-  'dodgerblue'           =&gt; '1E90FF',
-  'firebrick'            =&gt; 'B22222',
-  'floralwhite'          =&gt; 'FFFAF0',
-  'forestgreen'          =&gt; '228B22',
-  'fuchsia'              =&gt; 'FF00FF',
-  'gainsboro'            =&gt; 'DCDCDC',
-  'ghostwhite'           =&gt; 'F8F8FF',
-  'gold'                 =&gt; 'FFD700',
-  'goldenrod'            =&gt; 'DAA520',
-  'gray'                 =&gt; '808080',
-  'grey'                 =&gt; '808080',
-  'green'                =&gt; '008000',
-  'greenyellow'          =&gt; 'ADFF2F',
-  'honeydew'             =&gt; 'F0FFF0',
-  'hotpink'              =&gt; 'FF69B4',
-  'indianred'            =&gt; 'CD5C5C',
-  'indigo'               =&gt; '4B0082',
-  'ivory'                =&gt; 'FFFFF0',
-  'khaki'                =&gt; 'F0E68C',
-  'lavender'             =&gt; 'E6E6FA',
-  'lavenderblush'        =&gt; 'FFF0F5',
-  'lawngreen'            =&gt; '7CFC00',
-  'lemonchiffon'         =&gt; 'FFFACD',
-  'lightblue'            =&gt; 'ADD8E6',
-  'lightcoral'           =&gt; 'F08080',
-  'lightcyan'            =&gt; 'E0FFFF',
-  'lightgoldenrodyellow' =&gt; 'FAFAD2',
-  'lightgray'            =&gt; 'D3D3D3',
-  'lightgrey'            =&gt; 'D3D3D3',
-  'lightgreen'           =&gt; '90EE90',
-  'lightpink'            =&gt; 'FFB6C1',
-  'lightsalmon'          =&gt; 'FFA07A',
-  'lightseagreen'        =&gt; '20B2AA',
-  'lightskyblue'         =&gt; '87CEFA',
-  'lightslategray'       =&gt; '778899',
-  'lightslategrey'       =&gt; '778899',
-  'lightsteelblue'       =&gt; 'B0C4DE',
-  'lightyellow'          =&gt; 'FFFFE0',
-  'lime'                 =&gt; '00FF00',
-  'limegreen'            =&gt; '32CD32',
-  'linen'                =&gt; 'FAF0E6',
-  'magenta'              =&gt; 'FF00FF',
-  'maroon'               =&gt; '800000',
-  'mediumaquamarine'     =&gt; '66CDAA',
-  'mediumblue'           =&gt; '0000CD',
-  'mediumorchid'         =&gt; 'BA55D3',
-  'mediumpurple'         =&gt; '9370D8',
-  'mediumseagreen'       =&gt; '3CB371',
-  'mediumslateblue'      =&gt; '7B68EE',
-  'mediumspringgreen'    =&gt; '00FA9A',
-  'mediumturquoise'      =&gt; '48D1CC',
-  'mediumvioletred'      =&gt; 'C71585',
-  'midnightblue'         =&gt; '191970',
-  'mintcream'            =&gt; 'F5FFFA',
-  'mistyrose'            =&gt; 'FFE4E1',
-  'moccasin'             =&gt; 'FFE4B5',
-  'navajowhite'          =&gt; 'FFDEAD',
-  'navy'                 =&gt; '000080',
-  'oldlace'              =&gt; 'FDF5E6',
-  'olive'                =&gt; '808000',
-  'olivedrab'            =&gt; '6B8E23',
-  'orange'               =&gt; 'FFA500',
-  'orangered'            =&gt; 'FF4500',
-  'orchid'               =&gt; 'DA70D6',
-  'palegoldenrod'        =&gt; 'EEE8AA',
-  'palegreen'            =&gt; '98FB98',
-  'paleturquoise'        =&gt; 'AFEEEE',
-  'palevioletred'        =&gt; 'D87093',
-  'papayawhip'           =&gt; 'FFEFD5',
-  'peachpuff'            =&gt; 'FFDAB9',
-  'peru'                 =&gt; 'CD853F',
-  'pink'                 =&gt; 'FFC0CB',
-  'plum'                 =&gt; 'DDA0DD',
-  'powderblue'           =&gt; 'B0E0E6',
-  'purple'               =&gt; '800080',
-  'red'                  =&gt; 'FF0000',
-  'rosybrown'            =&gt; 'BC8F8F',
-  'royalblue'            =&gt; '4169E1',
-  'saddlebrown'          =&gt; '8B4513',
-  'salmon'               =&gt; 'FA8072',
-  'sandybrown'           =&gt; 'F4A460',
-  'seagreen'             =&gt; '2E8B57',
-  'seashell'             =&gt; 'FFF5EE',
-  'sienna'               =&gt; 'A0522D',
-  'silver'               =&gt; 'C0C0C0',
-  'skyblue'              =&gt; '87CEEB',
-  'slateblue'            =&gt; '6A5ACD',
-  'slategray'            =&gt; '708090',
-  'slategrey'            =&gt; '708090',
-  'snow'                 =&gt; 'FFFAFA',
-  'springgreen'          =&gt; '00FF7F',
-  'steelblue'            =&gt; '4682B4',
-  'tan'                  =&gt; 'D2B48C',
-  'teal'                 =&gt; '008080',
-  'thistle'              =&gt; 'D8BFD8',
-  'tomato'               =&gt; 'FF6347',
-  'turquoise'            =&gt; '40E0D0',
-  'violet'               =&gt; 'EE82EE',
-  'wheat'                =&gt; 'F5DEB3',
-  'white'                =&gt; 'FFFFFF',
-  'whitesmoke'           =&gt; 'F5F5F5',
-  'yellow'               =&gt; 'FFFF00',
-  'yellowgreen'          =&gt; '9ACD32',
-}
-
-if colour.length &gt; 0 and colour[0] != ?#
-  colour.downcase!
-  # Convert named colours to their hex values
-  colour = '#' + COLOURS[colour] if COLOURS.has_key? colour
-end
-
-if res = TextMate::UI.request_color(colour)
-  print res
-else
-  TextMate.exit_discard
-end
-</string>
-	<key>fallbackInput</key>
-	<string>word</string>
-	<key>input</key>
-	<string>selection</string>
-	<key>inputFormat</key>
-	<string>text</string>
-	<key>isDisabled</key>
-	<true/>
-	<key>keyEquivalent</key>
-	<string>@C</string>
-	<key>name</key>
-	<string>Insert Color…</string>
-	<key>outputCaret</key>
-	<string>heuristic</string>
-	<key>outputFormat</key>
-	<string>text</string>
-	<key>outputLocation</key>
-	<string>replaceInput</string>
-	<key>scope</key>
-	<string>source.css, meta.tag string.quoted -source</string>
-	<key>uuid</key>
-	<string>CC30D708-6E49-11D9-B411-000D93589AF6</string>
-	<key>version</key>
-	<integer>2</integer>
-</dict>
-</plist>
diff --git a/bundles/css.tmbundle/Commands/Preview.plist b/bundles/css.tmbundle/Commands/Preview.plist
deleted file mode 100644
index e6f6a7e38..000000000
--- a/bundles/css.tmbundle/Commands/Preview.plist
+++ /dev/null
@@ -1,277 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>command</key>
-	<string>#!/usr/bin/env ruby
-
-LIPSUM = "Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat."
-
-def tag_preview(selector_list)
-	html = 'TEXT_INSERT'
-	selectors = selector_list.split(/\s+/)
-	last_tag = ''
-	text_insert = "Generated preview for CSS selector #{selector_list}."
-
-	star_class = ''
-	star_id = ''
-	html_class = ''
-	html_id = ''
-	body_class = ''
-	body_id = ''
-
-	selectors.reverse.each do | selector |
-		singlet = false
-		tag = selector.clone
-		if (tag =~ /#(.+)/)
-			id = (tag.scan(/#(.+)/))[0][0]
-			id.gsub!(/\..+/, '')
-		else
-			id = nil
-		end
-		if (tag =~ /\.(.+)/)
-			cls = (tag.scan(/\.(.+)/))[0][0]
-			cls.gsub!(/\./, ' ')
-			cls.gsub!(/\#.+/, '')
-		else
-			cls = nil
-		end
-
-		tag.downcase!
-		tag.sub!(/#(.+)/, '');
-		tag.sub!(/\.(.+)/, '');
-		tag.sub!(/:.+/, '')
-
-		case tag
-		when '*'
-			star_class = " #{cls}" if cls
-			star_id = " id=\"#{id}\"" if id
-			cls = nil
-			id = nil
-			tag = 'div'
-		when 'body'
-			body_class = " #{cls}" if cls
-			body_id = " id=\"#{id}\"" if id
-			cls = nil
-			id = nil
-			tag = 'div'
-		when 'html'
-			html_class = " #{cls}" if cls
-			html_id = " id=\"#{id}\"" if id
-			cls = nil
-			id = nil
-			tag = 'div'
-		end
-
-		next if tag == '+'
-
-		if selector =~ /^[#.]/
-			case last_tag
-			when 'li'
-				tag = 'ul'
-			when 'td'
-				tag = 'tr'
-			when 'tr'
-				tag = 'table'
-			when /^h\d/
-				tag = 'div'
-			else
-				tag = 'span'
-			end
-		end
-
-		if (tag =~ /\[(.+?)\]/)
-			tag_attr = (tag.scan(/\[(.+?)\]/))[0][0]
-			tag.gsub!(/\[.+?\]/, '')
-		else
-			tag_attr = nil
-		end
-		part = "&lt;" + tag
-		part += " #{tag_attr}" if tag_attr
-		part += " id=\"#{id}\"" if id
-		part += " class=\"#{cls}\"" if cls
-
-		# defaults for img tag
-		case tag
-		when 'img'
-			part += " src=\"http://www.google.com/intl/en/images/logo.gif\""
-			part += " alt=\"Preview of #{selector_list}\""
-			singlet = true
-		when 'a'
-			part += " href=\"\#\""
-		when 'input'
-			open_tag = part.clone
-			part += " type=\"radio\" /&gt; Radio"
-			part += "#{open_tag} type=\"checkbox\" /&gt; Checkbox&lt;br /&gt;"
-			part += "#{open_tag} type=\"text\" value=\"Text Field\" /&gt;"
-			part += "#{open_tag} type=\"button\" value=\"Button\""
-			singlet = true
-		when 'select'
-			part += "&gt;&lt;option&gt;Option 1&lt;/option&gt;&lt;option&gt;Option 2&lt;/option"
-			html = ''
-		end
-
-		if (singlet)
-			part += " /&gt;"
-		else
-			part += "&gt;"
-			part += html
-			part += "&lt;/" + tag + "&gt;"
-		end
-
-		case tag
-		when /^h\d/
-			text_insert = tag.sub(/^h(\d+)/, "Heading \\1")
-		when 'p'
-			text_insert = LIPSUM
-		when 'object', 'img', 'input'
-			text_insert = ""
-		end
-
-		html = part
-		last_tag = tag
-	end
-
-	if (last_tag)
-		case last_tag
-		when 'em', 'strong', 'b', 'i'
-			html = "&lt;p&gt;#{html}&lt;/p&gt;"
-		when 'li'
-			html = "&lt;ul&gt;#{html}&lt;/ul&gt;"
-		when 'td'
-			html = "&lt;table&gt;&lt;tr&gt;#{html}&lt;/tr&gt;&lt;/table&gt;"
-		when 'tr'
-			html = "&lt;table&gt;#{html}&lt;/table&gt;"
-		when 'input', 'textarea', 'select'
-			html = "&lt;form method=\"get\"&gt;#{html}&lt;/form&gt;"
-		end
-	end
-
-	html = "&lt;div&gt;#{html}&lt;/div&gt;"
-	html.sub!(/TEXT_INSERT/, text_insert)
-
-	return &lt;&lt;EOT
-&lt;div class="__wrap_wrap"&gt;&lt;div class="__star_wrap#{star_class}"#{star_id}&gt;&lt;div class="__html_wrap#{html_class}"#{html_id}&gt;&lt;div class="__body_wrap#{body_class}"#{body_id}&gt;#{html}&lt;/div&gt;&lt;/div&gt;&lt;/div&gt;&lt;/div&gt;
-EOT
-end
-
-def preview_css(str)
-	orig_css = str.clone
-	orig_css.gsub!(/&lt;entity\.name\.tag\.wildcard\.css&gt;\*&lt;\/entity\.name\.tag\.wildcard\.css&gt;/, '.__star_wrap')
-	orig_css.gsub!(/&lt;entity\.name\.tag\.css&gt;body&lt;\/entity\.name\.tag\.css&gt;/, '.__body_wrap')
-	orig_css.gsub!(/&lt;entity\.name\.tag\.css&gt;html&lt;\/entity\.name\.tag\.css&gt;/, '.__html_wrap')
-
-	orig_css.gsub!(/&lt;.+?&gt;/, '')
-	orig_css.gsub!(/&amp;lt;\/?style\b.*?&amp;gt;/m, '')
-	orig_css.strip!
-
-	#meta.selector.css -&gt; wraps the selector
-	#meta.property-list.css -&gt; wraps the properties
-	rules = str.scan(/&lt;meta\.selector\.css&gt;\s*(.+?)\s*&lt;\/meta\.selector\.css&gt;.*?&lt;meta\.property-list\.css&gt;(.+?)&lt;\/meta\.property-list\.css&gt;/m)
-
-	html = ''
-	css = ''
-	rule_num = 0
-
-	rules.each do | rule |
-		selector = rule[0].gsub(/&lt;.+?&gt;/, '')
-		styles = rule[1].gsub(/&lt;.+?&gt;/, '')
-		styles.gsub!(/^\s*\{\n*/m, '')
-		styles.gsub!(/\s*\}\s*$/m, '')
-		styles.gsub!(/\t/, ' ' * ENV['TM_TAB_SIZE'].to_i)
-		selectors = selector.split(/\s*,\s*/m)
-		selectors.each do | single_selector |
-			rule_num += 1
-			html += "&lt;div class=\"__rule_clear\"&gt;&lt;/div&gt;\n\n" if html != ''
-			html += "&lt;div class=\"__rule_selector\"&gt;#{single_selector} &lt;a class=\"__view_link\" href=\"javascript:viewCSS('__rule#{rule_num}')\" title=\"Click to toggle CSS view\"&gt;CSS&lt;/a&gt;&lt;div class=\"__rule\" id=\"__rule#{rule_num}\" style=\"display: none\"&gt;#{styles}&lt;/div&gt;&lt;/div&gt;\n\n"
-			html += tag_preview(single_selector) + "\n\n"
-		end
-	end
-
-	filename = ENV['TM_FILENAME'] || 'untitled'
-	base = ''
-	base = "&lt;base href=\"file://#{ENV['TM_FILEPATH']}\" /&gt;" if ENV['TM_FILEPATH']
-
-	return &lt;&lt;EOT
-&lt;?xml version="1.0" encoding="utf-8"?&gt;
-&lt;!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" 
-	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"&gt;
-&lt;html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"&gt;
-	&lt;head&gt;
-		#{base}
-		&lt;meta http-equiv="Content-type" content="text/html; charset=utf-8" /&gt;
-		&lt;meta http-equiv="Content-Language" content="en-us" /&gt;
-		&lt;title&gt;CSS Preview for #{filename}&lt;/title&gt;
-		&lt;style type="text/css"&gt;
-#{orig_css}
-.__wrap_wrap {
-	position: relative;
-	margin-top: 5px;
-	margin-bottom: 20px;
-	border-top: 1px solid #ccc;
-}
-.__rule_selector {
-	font-family: Times;
-	font-size: 16px;
-	border-top: 1px solid #ccc;
-}
-.__rule {
-	white-space: pre;
-	word-wrap: break-word;
-	font-family: Monaco;
-	font-size: 11px;
-}
-.__view_link {
-	font-family: Monaco;
-	font-size: 11px;
-}
-.__rule_clear:after {
-	content: "."; 
-	display: block; 
-	height: 0; 
-	clear: both; 
-	visibility: hidden;
-}
-		&lt;/style&gt;
-		&lt;script type="text/javascript"&gt;
-		function viewCSS(rule_id) {
-			var el = document.getElementById(rule_id);
-			if (el) {
-				if (el.style.display == 'none')
-					el.style.display = 'block';
-				else
-					el.style.display = 'none';
-			}
-		}
-		&lt;/script&gt;
-	&lt;/head&gt;
-	
-	&lt;body&gt;
-#{html}
-	&lt;/body&gt;
-&lt;/html&gt;
-EOT
-end
-
-print preview_css(STDIN.read)
-</string>
-	<key>fallbackInput</key>
-	<string>scope</string>
-	<key>input</key>
-	<string>selection</string>
-	<key>inputFormat</key>
-	<string>xml</string>
-	<key>keyEquivalent</key>
-	<string>^~@p</string>
-	<key>name</key>
-	<string>Preview</string>
-	<key>output</key>
-	<string>showAsHTML</string>
-	<key>scope</key>
-	<string>source.css - text.html</string>
-	<key>uuid</key>
-	<string>05554FE0-4A70-4F3E-81C5-72855D7EB428</string>
-</dict>
-</plist>
diff --git a/bundles/css.tmbundle/Commands/Validate Selected CSS.plist b/bundles/css.tmbundle/Commands/Validate Selected CSS.plist
deleted file mode 100644
index 1ff50adab..000000000
--- a/bundles/css.tmbundle/Commands/Validate Selected CSS.plist	
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>command</key>
-	<string>#!/usr/bin/env ruby
-
-print '&lt;html&gt;&lt;head&gt;&lt;meta http-equiv="Refresh" content="0; URL='
-print 'http://jigsaw.w3.org/css-validator/validator?warning=1&amp;profile=none&amp;usermedium=all&amp;text='
-
-scope = STDIN.read
-
-scope.gsub!(/&lt;\/?style.*?&gt;/, '')
-
-((scope != nil &amp;&amp; scope.size &gt; 0) ? scope : $&lt; ).each_byte do |b|
-
-  if b == 32
-    print '+'
-  elsif b.chr =~ /\w/
-    print b.chr
-  else
-    printf '%%%02x', b
-  end
-end
-
-puts '#errors"&gt;&lt;/head&gt;&lt;body&gt;&lt;/body&gt;&lt;/html&gt;'</string>
-	<key>fallbackInput</key>
-	<string>scope</string>
-	<key>input</key>
-	<string>selection</string>
-	<key>keyEquivalent</key>
-	<string>^V</string>
-	<key>name</key>
-	<string>Validate CSS</string>
-	<key>output</key>
-	<string>showAsHTML</string>
-	<key>scope</key>
-	<string>source.css</string>
-	<key>uuid</key>
-	<string>45E5E5A1-84CC-11D9-970D-0011242E4184</string>
-</dict>
-</plist>
diff --git a/bundles/css.tmbundle/DragCommands/Insert Image URL.tmDragCommand b/bundles/css.tmbundle/DragCommands/Insert Image URL.tmDragCommand
deleted file mode 100644
index 0c7f379b0..000000000
--- a/bundles/css.tmbundle/DragCommands/Insert Image URL.tmDragCommand	
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>bundleUUID</key>
-	<string>4675F24E-6227-11D9-BFB1-000D93589AF6</string>
-	<key>command</key>
-	<string>if echo "$TM_SCOPE" | grep -q meta.property-list.css 
-   then
-	if echo "$TM_SCOPE" | grep -q meta.property-value.css 
-       then
-		if echo "$TM_CURRENT_WORD" | grep -q url\(\)
-			then echo -n "'$TM_DROPPED_FILE'"
-		elif echo "$TM_SCOPE" | grep -q string.quoted.single.css
-			then echo -n "$TM_DROPPED_FILE"
-		else 
-			echo -n "url('$TM_DROPPED_FILE')"
-		fi
-	else 
-		echo -ne "background:\${1: #\${2:DDD}} url('$TM_DROPPED_FILE')\${3: \${4:repeat/repeat-x/repeat-y/no-repeat} \${5:scroll/fixed} \${6:top/center/bottom/x-%/x-pos} \${7:left/center/right/y-%/y-pos}};\n\$0"
-	fi
-else
-	echo -ne "\${1:#selector} {\n	background: url('$TM_DROPPED_FILE')\${3: \${4:no-repeat} \${5:scroll} \${6:top} \${7:left}};\n"
-	sips -g pixelWidth -g pixelHeight "$TM_DROPPED_FILE"|awk '/pixelWidth/  { printf("	width: %dpx;\n",  $2) } /pixelHeight/ { printf("	height: %dpx;\n}\$0", $2) }'
-fi</string>
-	<key>draggedFileExtensions</key>
-	<array>
-		<string>png</string>
-		<string>jpeg</string>
-		<string>jpg</string>
-		<string>gif</string>
-	</array>
-	<key>name</key>
-	<string>Insert Image URL</string>
-	<key>output</key>
-	<string>insertAsSnippet</string>
-	<key>scope</key>
-	<string>source.css</string>
-	<key>uuid</key>
-	<string>6ED38063-8791-41BB-9F9F-F9EA378B1526</string>
-</dict>
-</plist>
diff --git a/bundles/css.tmbundle/Macros/Format CSS Compressed.tmMacro b/bundles/css.tmbundle/Macros/Format CSS Compressed.tmMacro
deleted file mode 100644
index 67efc3727..000000000
--- a/bundles/css.tmbundle/Macros/Format CSS Compressed.tmMacro	
+++ /dev/null
@@ -1,190 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>commands</key>
-	<array>
-		<dict>
-			<key>argument</key>
-			<dict>
-				<key>action</key>
-				<string>replaceAll</string>
-				<key>findInProjectIgnoreCase</key>
-				<true/>
-				<key>findInProjectRegularExpression</key>
-				<false/>
-				<key>findString</key>
-				<string>\n+</string>
-				<key>ignoreCase</key>
-				<true/>
-				<key>regularExpression</key>
-				<true/>
-				<key>replaceAllScope</key>
-				<string>selection</string>
-				<key>replaceString</key>
-				<string>\n</string>
-				<key>wrapAround</key>
-				<true/>
-			</dict>
-			<key>command</key>
-			<string>findWithOptions:</string>
-		</dict>
-		<dict>
-			<key>argument</key>
-			<dict>
-				<key>action</key>
-				<string>replaceAll</string>
-				<key>findInProjectIgnoreCase</key>
-				<true/>
-				<key>findInProjectRegularExpression</key>
-				<false/>
-				<key>findString</key>
-				<string>[ \t]+</string>
-				<key>ignoreCase</key>
-				<true/>
-				<key>regularExpression</key>
-				<true/>
-				<key>replaceAllScope</key>
-				<string>selection</string>
-				<key>replaceString</key>
-				<string> </string>
-				<key>wrapAround</key>
-				<true/>
-			</dict>
-			<key>command</key>
-			<string>findWithOptions:</string>
-		</dict>
-		<dict>
-			<key>argument</key>
-			<dict>
-				<key>action</key>
-				<string>replaceAll</string>
-				<key>findInProjectIgnoreCase</key>
-				<true/>
-				<key>findInProjectRegularExpression</key>
-				<false/>
-				<key>findString</key>
-				<string>(?m)([;:])\s+</string>
-				<key>ignoreCase</key>
-				<true/>
-				<key>regularExpression</key>
-				<true/>
-				<key>replaceAllScope</key>
-				<string>selection</string>
-				<key>replaceString</key>
-				<string>$1</string>
-				<key>wrapAround</key>
-				<true/>
-			</dict>
-			<key>command</key>
-			<string>findWithOptions:</string>
-		</dict>
-		<dict>
-			<key>argument</key>
-			<dict>
-				<key>action</key>
-				<string>replaceAll</string>
-				<key>findInProjectIgnoreCase</key>
-				<true/>
-				<key>findInProjectRegularExpression</key>
-				<false/>
-				<key>findString</key>
-				<string>\s*}\s*</string>
-				<key>ignoreCase</key>
-				<true/>
-				<key>regularExpression</key>
-				<true/>
-				<key>replaceAllScope</key>
-				<string>selection</string>
-				<key>replaceString</key>
-				<string>}\n</string>
-				<key>wrapAround</key>
-				<true/>
-			</dict>
-			<key>command</key>
-			<string>findWithOptions:</string>
-		</dict>
-		<dict>
-			<key>argument</key>
-			<dict>
-				<key>action</key>
-				<string>replaceAll</string>
-				<key>findInProjectIgnoreCase</key>
-				<true/>
-				<key>findInProjectRegularExpression</key>
-				<false/>
-				<key>findString</key>
-				<string>\s*{\s*</string>
-				<key>ignoreCase</key>
-				<true/>
-				<key>regularExpression</key>
-				<true/>
-				<key>replaceAllScope</key>
-				<string>selection</string>
-				<key>replaceString</key>
-				<string>{</string>
-				<key>wrapAround</key>
-				<true/>
-			</dict>
-			<key>command</key>
-			<string>findWithOptions:</string>
-		</dict>
-		<dict>
-			<key>argument</key>
-			<dict>
-				<key>action</key>
-				<string>replaceAll</string>
-				<key>findInProjectIgnoreCase</key>
-				<true/>
-				<key>findInProjectRegularExpression</key>
-				<false/>
-				<key>findString</key>
-				<string>[ \t]*,[ \t]*</string>
-				<key>ignoreCase</key>
-				<true/>
-				<key>regularExpression</key>
-				<true/>
-				<key>replaceAllScope</key>
-				<string>selection</string>
-				<key>replaceString</key>
-				<string>,</string>
-				<key>wrapAround</key>
-				<true/>
-			</dict>
-			<key>command</key>
-			<string>findWithOptions:</string>
-		</dict>
-		<dict>
-			<key>argument</key>
-			<dict>
-				<key>action</key>
-				<string>replaceAll</string>
-				<key>findInProjectIgnoreCase</key>
-				<true/>
-				<key>findInProjectRegularExpression</key>
-				<false/>
-				<key>findString</key>
-				<string>^\s+</string>
-				<key>ignoreCase</key>
-				<true/>
-				<key>regularExpression</key>
-				<true/>
-				<key>replaceAllScope</key>
-				<string>selection</string>
-				<key>wrapAround</key>
-				<true/>
-			</dict>
-			<key>command</key>
-			<string>findWithOptions:</string>
-		</dict>
-	</array>
-	<key>keyEquivalent</key>
-	<string>^~q</string>
-	<key>name</key>
-	<string>Format CSS Compressed</string>
-	<key>scope</key>
-	<string>source.css</string>
-	<key>uuid</key>
-	<string>3556C0BE-73B3-45CE-8C9C-7B3AA3BB038B</string>
-</dict>
-</plist>
diff --git a/bundles/css.tmbundle/Macros/Format CSS.tmMacro b/bundles/css.tmbundle/Macros/Format CSS.tmMacro
deleted file mode 100644
index ea08e1884..000000000
--- a/bundles/css.tmbundle/Macros/Format CSS.tmMacro	
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>commands</key>
-	<array>
-		<dict>
-			<key>argument</key>
-			<dict>
-				<key>action</key>
-				<string>replaceAll</string>
-				<key>findInProjectIgnoreCase</key>
-				<true/>
-				<key>findInProjectRegularExpression</key>
-				<false/>
-				<key>findString</key>
-				<string>(?m)({|;)\s*([-\w]+:)\s*(?=\S)</string>
-				<key>ignoreCase</key>
-				<true/>
-				<key>regularExpression</key>
-				<true/>
-				<key>replaceAllScope</key>
-				<string>selection</string>
-				<key>replaceString</key>
-				<string>$1\n$2 </string>
-				<key>wrapAround</key>
-				<true/>
-			</dict>
-			<key>command</key>
-			<string>findWithOptions:</string>
-		</dict>
-		<dict>
-			<key>argument</key>
-			<dict>
-				<key>action</key>
-				<string>replaceAll</string>
-				<key>findInProjectIgnoreCase</key>
-				<true/>
-				<key>findInProjectRegularExpression</key>
-				<false/>
-				<key>findString</key>
-				<string>(?m)\s*}[ \t]*\n?</string>
-				<key>ignoreCase</key>
-				<true/>
-				<key>regularExpression</key>
-				<true/>
-				<key>replaceAllScope</key>
-				<string>selection</string>
-				<key>replaceString</key>
-				<string>\n}\n</string>
-				<key>wrapAround</key>
-				<true/>
-			</dict>
-			<key>command</key>
-			<string>findWithOptions:</string>
-		</dict>
-		<dict>
-			<key>argument</key>
-			<dict>
-				<key>action</key>
-				<string>replaceAll</string>
-				<key>findInProjectIgnoreCase</key>
-				<true/>
-				<key>findInProjectRegularExpression</key>
-				<false/>
-				<key>findString</key>
-				<string>(?m)\s*{[ \t]*</string>
-				<key>ignoreCase</key>
-				<true/>
-				<key>regularExpression</key>
-				<true/>
-				<key>replaceAllScope</key>
-				<string>selection</string>
-				<key>replaceString</key>
-				<string> {</string>
-				<key>wrapAround</key>
-				<true/>
-			</dict>
-			<key>command</key>
-			<string>findWithOptions:</string>
-		</dict>
-		<dict>
-			<key>command</key>
-			<string>alignLeft:</string>
-		</dict>
-		<dict>
-			<key>command</key>
-			<string>indent:</string>
-		</dict>
-	</array>
-	<key>keyEquivalent</key>
-	<string>^q</string>
-	<key>name</key>
-	<string>Format CSS</string>
-	<key>scope</key>
-	<string>source.css</string>
-	<key>uuid</key>
-	<string>64180C76-8C8D-4F29-82BE-6096BE1B14D8</string>
-</dict>
-</plist>
diff --git a/bundles/css.tmbundle/Preferences/Comments.tmPreferences b/bundles/css.tmbundle/Preferences/Comments.tmPreferences
deleted file mode 100644
index 6de289f65..000000000
--- a/bundles/css.tmbundle/Preferences/Comments.tmPreferences
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>name</key>
-	<string>Comments</string>
-	<key>scope</key>
-	<string>source.css</string>
-	<key>settings</key>
-	<dict>
-		<key>shellVariables</key>
-		<array>
-			<dict>
-				<key>name</key>
-				<string>TM_COMMENT_START</string>
-				<key>value</key>
-				<string>/*</string>
-			</dict>
-			<dict>
-				<key>name</key>
-				<string>TM_COMMENT_END</string>
-				<key>value</key>
-				<string>*/</string>
-			</dict>
-			<dict>
-				<key>name</key>
-				<string>TM_COMMENT_DISABLE_INDENT</string>
-				<key>value</key>
-				<string>yes</string>
-			</dict>
-		</array>
-	</dict>
-	<key>uuid</key>
-	<string>375CF370-8A7B-450A-895C-FD18B47957E2</string>
-</dict>
-</plist>
diff --git a/bundles/css.tmbundle/Preferences/Completions.tmPreferences b/bundles/css.tmbundle/Preferences/Completions.tmPreferences
deleted file mode 100644
index 4e79c6882..000000000
--- a/bundles/css.tmbundle/Preferences/Completions.tmPreferences
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>name</key>
-	<string>Completions</string>
-	<key>scope</key>
-	<string>source.css -meta.property-list</string>
-	<key>settings</key>
-	<dict>
-		<key>completions</key>
-		<array>
-			<string>*</string>
-			<string>#</string>
-			<string>.</string>
-			<string>a</string>
-			<string>abbr</string>
-			<string>acronym</string>
-			<string>address</string>
-			<string>area</string>
-			<string>b</string>
-			<string>base</string>
-			<string>big</string>
-			<string>blockquote</string>
-			<string>body</string>
-			<string>br</string>
-			<string>button</string>
-			<string>caption</string>
-			<string>cite</string>
-			<string>code</string>
-			<string>col</string>
-			<string>colgroup</string>
-			<string>dd</string>
-			<string>del</string>
-			<string>dfn</string>
-			<string>div</string>
-			<string>dl</string>
-			<string>dt</string>
-			<string>em</string>
-			<string>fieldset</string>
-			<string>form</string>
-			<string>frame</string>
-			<string>frameset</string>
-			<string>h1</string>
-			<string>h2</string>
-			<string>h3</string>
-			<string>h4</string>
-			<string>h5</string>
-			<string>h6</string>
-			<string>head</string>
-			<string>hr</string>
-			<string>html</string>
-			<string>i</string>
-			<string>iframe</string>
-			<string>img</string>
-			<string>input</string>
-			<string>ins</string>
-			<string>kbd</string>
-			<string>label</string>
-			<string>legend</string>
-			<string>li</string>
-			<string>link</string>
-			<string>map</string>
-			<string>meta</string>
-			<string>noframes</string>
-			<string>noscript</string>
-			<string>object</string>
-			<string>ol</string>
-			<string>optgroup</string>
-			<string>option</string>
-			<string>p</string>
-			<string>param</string>
-			<string>pre</string>
-			<string>q</string>
-			<string>samp</string>
-			<string>script</string>
-			<string>select</string>
-			<string>small</string>
-			<string>span</string>
-			<string>strike</string>
-			<string>strong</string>
-			<string>style</string>
-			<string>sub</string>
-			<string>sup</string>
-			<string>table</string>
-			<string>tbody</string>
-			<string>td</string>
-			<string>textarea</string>
-			<string>tfoot</string>
-			<string>th</string>
-			<string>thead</string>
-			<string>title</string>
-			<string>tr</string>
-			<string>tt</string>
-			<string>ul</string>
-			<string>var</string>
-		</array>
-	</dict>
-	<key>uuid</key>
-	<string>92B0C9FE-CC81-498A-B93C-376A9C47CF2D</string>
-</dict>
-</plist>
diff --git a/bundles/css.tmbundle/Preferences/Folding.tmPreferences b/bundles/css.tmbundle/Preferences/Folding.tmPreferences
deleted file mode 100644
index 7a862f017..000000000
--- a/bundles/css.tmbundle/Preferences/Folding.tmPreferences
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>name</key>
-	<string>Folding</string>
-	<key>scope</key>
-	<string>source.css</string>
-	<key>settings</key>
-	<dict>
-		<key>foldingStartMarker</key>
-		<string>/\*\*(?!\*)|\{\s*($|/\*(?!.*?\*/.*\S))|\/\*\s*@group\s*.*\s*\*\/</string>
-		<key>foldingStopMarker</key>
-		<string>(?&lt;!\*)\*\*/|^\s*\}|\/*\s*@end\s*\*\/</string>
-	</dict>
-	<key>uuid</key>
-	<string>37393068-A217-494A-9DA4-68FD43FB4F8B</string>
-</dict>
-</plist>
diff --git a/bundles/css.tmbundle/Preferences/Miscellaneous.tmPreferences b/bundles/css.tmbundle/Preferences/Miscellaneous.tmPreferences
deleted file mode 100644
index 9769c4b3e..000000000
--- a/bundles/css.tmbundle/Preferences/Miscellaneous.tmPreferences
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>name</key>
-	<string>Miscellaneous</string>
-	<key>scope</key>
-	<string>source.css</string>
-	<key>settings</key>
-	<dict>
-		<key>smartTypingPairs</key>
-		<array>
-			<array>
-				<string>"</string>
-				<string>"</string>
-			</array>
-			<array>
-				<string>(</string>
-				<string>)</string>
-			</array>
-			<array>
-				<string>{</string>
-				<string>}</string>
-			</array>
-			<array>
-				<string>[</string>
-				<string>]</string>
-			</array>
-			<array>
-				<string>“</string>
-				<string>”</string>
-			</array>
-			<array>
-				<string>'</string>
-				<string>'</string>
-			</array>
-			<array>
-				<string>`</string>
-				<string>`</string>
-			</array>
-		</array>
-	</dict>
-	<key>uuid</key>
-	<string>623154CA-0EDF-4365-9441-80D396C11979</string>
-</dict>
-</plist>
diff --git a/bundles/css.tmbundle/Preferences/Property Completions.tmPreferences b/bundles/css.tmbundle/Preferences/Property Completions.tmPreferences
deleted file mode 100644
index 65741a97d..000000000
--- a/bundles/css.tmbundle/Preferences/Property Completions.tmPreferences	
+++ /dev/null
@@ -1,151 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>name</key>
-	<string>Property Completions</string>
-	<key>scope</key>
-	<string>source.css meta.property-list -meta.property-value</string>
-	<key>settings</key>
-	<dict>
-		<key>completions</key>
-		<array>
-			<string>-moz-border-radius</string>
-			<string>azimuth</string>
-			<string>background</string>
-			<string>background-attachment</string>
-			<string>background-color</string>
-			<string>background-image</string>
-			<string>background-position</string>
-			<string>background-repeat</string>
-			<string>border</string>
-			<string>border-bottom</string>
-			<string>border-bottom-color</string>
-			<string>border-bottom-style</string>
-			<string>border-bottom-width</string>
-			<string>border-collapse</string>
-			<string>border-color</string>
-			<string>border-left</string>
-			<string>border-left-color</string>
-			<string>border-left-style</string>
-			<string>border-left-width</string>
-			<string>border-right</string>
-			<string>border-right-color</string>
-			<string>border-right-style</string>
-			<string>border-right-width</string>
-			<string>border-spacing</string>
-			<string>border-style</string>
-			<string>border-top</string>
-			<string>border-top-color</string>
-			<string>border-top-style</string>
-			<string>border-top-width</string>
-			<string>border-width</string>
-			<string>bottom</string>
-			<string>caption-side</string>
-			<string>clear</string>
-			<string>clip</string>
-			<string>color</string>
-			<string>content</string>
-			<string>counter-increment</string>
-			<string>counter-reset</string>
-			<string>cue</string>
-			<string>cue-after</string>
-			<string>cue-before</string>
-			<string>cursor</string>
-			<string>direction</string>
-			<string>display</string>
-			<string>elevation</string>
-			<string>empty-cells</string>
-			<string>float</string>
-			<string>font</string>
-			<string>font-family</string>
-			<string>font-size</string>
-			<string>font-size-adjust</string>
-			<string>font-stretch</string>
-			<string>font-style</string>
-			<string>font-variant</string>
-			<string>font-weight</string>
-			<string>height</string>
-			<string>left</string>
-			<string>letter</string>
-			<string>letter-spacing</string>
-			<string>line-height</string>
-			<string>list</string>
-			<string>list-style</string>
-			<string>list-style-image</string>
-			<string>list-style-position</string>
-			<string>list-style-type</string>
-			<string>margin</string>
-			<string>margin-bottom</string>
-			<string>margin-left</string>
-			<string>margin-right</string>
-			<string>margin-top</string>
-			<string>marker</string>
-			<string>marker-offset</string>
-			<string>marks</string>
-			<string>max-height</string>
-			<string>max-width</string>
-			<string>min-height</string>
-			<string>min-width</string>
-			<string>opacity</string>
-			<string>orphans</string>
-			<string>outline</string>
-			<string>outline-color</string>
-			<string>outline-style</string>
-			<string>outline-width</string>
-			<string>overflow</string>
-			<string>overflow(-[xy])?</string>
-			<string>padding</string>
-			<string>padding-bottom</string>
-			<string>padding-left</string>
-			<string>padding-right</string>
-			<string>padding-top</string>
-			<string>page</string>
-			<string>page-break-after</string>
-			<string>page-break-before</string>
-			<string>page-break-inside</string>
-			<string>pause</string>
-			<string>pause-after</string>
-			<string>pause-before</string>
-			<string>pitch</string>
-			<string>pitch-range</string>
-			<string>play-during</string>
-			<string>position</string>
-			<string>quotes</string>
-			<string>richness</string>
-			<string>right</string>
-			<string>scrollbar</string>
-			<string>size</string>
-			<string>speak</string>
-			<string>speak-header</string>
-			<string>speak-numeral</string>
-			<string>speak-punctuation</string>
-			<string>speech-rate</string>
-			<string>stress</string>
-			<string>table-layout</string>
-			<string>text</string>
-			<string>text-align</string>
-			<string>text-decoration</string>
-			<string>text-indent</string>
-			<string>text-shadow</string>
-			<string>text-transform</string>
-			<string>top</string>
-			<string>unicode-bidi</string>
-			<string>vertical</string>
-			<string>vertical-align</string>
-			<string>visibility</string>
-			<string>voice-family</string>
-			<string>volume</string>
-			<string>white</string>
-			<string>white-space</string>
-			<string>widows</string>
-			<string>width</string>
-			<string>word</string>
-			<string>word-spacing</string>
-			<string>z-index</string>
-		</array>
-	</dict>
-	<key>uuid</key>
-	<string>BCAF7514-033E-45D7-9E46-07FACF84DAAD</string>
-</dict>
-</plist>
diff --git a/bundles/css.tmbundle/Preferences/Property Value Completions.tmPreferences b/bundles/css.tmbundle/Preferences/Property Value Completions.tmPreferences
deleted file mode 100644
index 5c1150cde..000000000
--- a/bundles/css.tmbundle/Preferences/Property Value Completions.tmPreferences	
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>name</key>
-	<string>Property Value Completions</string>
-	<key>scope</key>
-	<string>source.css meta.property-value</string>
-	<key>settings</key>
-	<dict>
-		<key>completions</key>
-		<array>
-			<string>absolute</string>
-			<string>all-scroll</string>
-			<string>always</string>
-			<string>auto</string>
-			<string>baseline</string>
-			<string>below</string>
-			<string>bidi-override</string>
-			<string>block</string>
-			<string>bold</string>
-			<string>bolder</string>
-			<string>both</string>
-			<string>bottom</string>
-			<string>break-all</string>
-			<string>break-word</string>
-			<string>capitalize</string>
-			<string>center</string>
-			<string>char</string>
-			<string>circle</string>
-			<string>col-resize</string>
-			<string>collapse</string>
-			<string>crosshair</string>
-			<string>dashed</string>
-			<string>decimal</string>
-			<string>default</string>
-			<string>disabled</string>
-			<string>disc</string>
-			<string>distribute</string>
-			<string>distribute-all-lines</string>
-			<string>distribute-letter</string>
-			<string>distribute-space</string>
-			<string>dotted</string>
-			<string>double</string>
-			<string>e-resize</string>
-			<string>ellipsis</string>
-			<string>fixed</string>
-			<string>groove</string>
-			<string>hand</string>
-			<string>help</string>
-			<string>hidden</string>
-			<string>horizontal</string>
-			<string>ideograph-alpha</string>
-			<string>ideograph-numeric</string>
-			<string>ideograph-parenthesis</string>
-			<string>ideograph-space</string>
-			<string>inactive</string>
-			<string>inherit</string>
-			<string>inline</string>
-			<string>inline-block</string>
-			<string>inset</string>
-			<string>inside</string>
-			<string>inter-ideograph</string>
-			<string>inter-word</string>
-			<string>italic</string>
-			<string>justify</string>
-			<string>keep-all</string>
-			<string>left</string>
-			<string>lighter</string>
-			<string>line</string>
-			<string>line-edge</string>
-			<string>line-through</string>
-			<string>list-item</string>
-			<string>loose</string>
-			<string>lower-alpha</string>
-			<string>lower-roman</string>
-			<string>lowercase</string>
-			<string>lr-tb</string>
-			<string>ltr</string>
-			<string>medium</string>
-			<string>middle</string>
-			<string>move</string>
-			<string>n-resize</string>
-			<string>ne-resize</string>
-			<string>newspaper</string>
-			<string>no-drop</string>
-			<string>no-repeat</string>
-			<string>none</string>
-			<string>normal</string>
-			<string>not-allowed</string>
-			<string>nowrap</string>
-			<string>nw-resize</string>
-			<string>oblique</string>
-			<string>outset</string>
-			<string>outside</string>
-			<string>overline</string>
-			<string>pointer</string>
-			<string>progress</string>
-			<string>relative</string>
-			<string>repeat</string>
-			<string>repeat-x</string>
-			<string>repeat-y</string>
-			<string>ridge</string>
-			<string>right</string>
-			<string>row-resize</string>
-			<string>rtl</string>
-			<string>s-resize</string>
-			<string>scroll</string>
-			<string>se-resize</string>
-			<string>separate</string>
-			<string>small-caps</string>
-			<string>solid</string>
-			<string>square</string>
-			<string>static</string>
-			<string>strict</string>
-			<string>super</string>
-			<string>sw-resize</string>
-			<string>table-footer-group</string>
-			<string>table-header-group</string>
-			<string>tb-rl</string>
-			<string>text</string>
-			<string>text-bottom</string>
-			<string>text-top</string>
-			<string>thick</string>
-			<string>thin</string>
-			<string>top</string>
-			<string>transparent</string>
-			<string>underline</string>
-			<string>upper-alpha</string>
-			<string>upper-roman</string>
-			<string>uppercase</string>
-			<string>url("")</string>
-			<string>vertical-ideographic</string>
-			<string>vertical-text</string>
-			<string>visible</string>
-			<string>w-resize</string>
-			<string>wait</string>
-			<string>whitespace</string>
-		</array>
-	</dict>
-	<key>uuid</key>
-	<string>1E4F54FD-1940-42E0-9D0A-0EC11D81E446</string>
-</dict>
-</plist>
diff --git a/bundles/css.tmbundle/Preferences/PropertyName.tmPreferences b/bundles/css.tmbundle/Preferences/PropertyName.tmPreferences
deleted file mode 100644
index 98db1ac5b..000000000
--- a/bundles/css.tmbundle/Preferences/PropertyName.tmPreferences
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>name</key>
-	<string>PropertyName</string>
-	<key>scope</key>
-	<string>meta.property-list.css -meta.property-value</string>
-	<key>settings</key>
-	<dict>
-		<key>smartTypingPairs</key>
-		<array>
-			<array>
-				<string>:</string>
-				<string>;</string>
-			</array>
-		</array>
-	</dict>
-	<key>uuid</key>
-	<string>45707407-3307-4B4D-AE9B-78BDCFB6F920</string>
-</dict>
-</plist>
diff --git a/bundles/css.tmbundle/Preferences/Symbol List: Group.tmPreferences b/bundles/css.tmbundle/Preferences/Symbol List: Group.tmPreferences
deleted file mode 100644
index 82ef163f3..000000000
--- a/bundles/css.tmbundle/Preferences/Symbol List: Group.tmPreferences	
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>name</key>
-	<string>Symbol List: Group</string>
-	<key>scope</key>
-	<string>source.css comment.block.css -source.css.embedded</string>
-	<key>settings</key>
-	<dict>
-		<key>showInSymbolList</key>
-		<integer>1</integer>
-		<key>symbolTransformation</key>
-		<string>s/\/\*\*\s*(.*?)\s*\*\//** $1 **/; s/\/\*.*?\*\*\//./; s/\/\*[^\*].*?[^\*]\*\///</string>
-	</dict>
-	<key>uuid</key>
-	<string>096894D8-6A5A-4F1D-B68C-782F0A850E52</string>
-</dict>
-</plist>
diff --git a/bundles/css.tmbundle/Preferences/Symbol list.tmPreferences b/bundles/css.tmbundle/Preferences/Symbol list.tmPreferences
deleted file mode 100644
index 7e235548f..000000000
--- a/bundles/css.tmbundle/Preferences/Symbol list.tmPreferences	
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>name</key>
-	<string>Symbol List: Selector</string>
-	<key>scope</key>
-	<string>source.css meta.selector, source.css meta.at-rule.media</string>
-	<key>settings</key>
-	<dict>
-		<key>showInSymbolList</key>
-		<integer>1</integer>
-		<key>symbolTransformation</key>
-		<string>s/^\s*/CSS: /; s/\s+/ /g</string>
-	</dict>
-	<key>uuid</key>
-	<string>17B2DD5B-D2EA-4DC5-9C7D-B09B505156C5</string>
-</dict>
-</plist>
diff --git a/bundles/css.tmbundle/README.mdown b/bundles/css.tmbundle/README.mdown
deleted file mode 100644
index 32d8f85a4..000000000
--- a/bundles/css.tmbundle/README.mdown
+++ /dev/null
@@ -1,20 +0,0 @@
-# Installation
-
-You can install this bundle in TextMate by opening the preferences and going to the bundles tab. After installation it will be automatically updated for you.
-
-# General
-
-* [Bundle Styleguide](http://kb.textmate.org/bundle_styleguide) — _before you make changes_
-* [Commit Styleguide](http://kb.textmate.org/commit_styleguide) — _before you send a pull request_
-* [Writing Bug Reports](http://kb.textmate.org/writing_bug_reports) — _before you report an issue_
-
-# License
-
-If not otherwise specified (see below), files in this repository fall under the following license:
-
-	Permission to copy, use, modify, sell and distribute this
-	software is granted. This software is provided "as is" without
-	express or implied warranty, and with no claim as to its
-	suitability for any purpose.
-
-An exception is made for files in readable text which contain their own license information, or files where an accompanying file exists (in the same directory) with a “-license” suffix added to the base-name name of the original file, and an extension of txt, html, or similar. For example “tidy” is accompanied by “tidy-license.txt”.
\ No newline at end of file
diff --git a/bundles/css.tmbundle/Snippets/!important CSS (!).plist b/bundles/css.tmbundle/Snippets/!important CSS (!).plist
deleted file mode 100644
index 1cee42155..000000000
--- a/bundles/css.tmbundle/Snippets/!important CSS (!).plist	
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>${1:!important}</string>
-	<key>keyEquivalent</key>
-	<string></string>
-	<key>name</key>
-	<string>!important CSS</string>
-	<key>scope</key>
-	<string>source.css</string>
-	<key>tabTrigger</key>
-	<string>!</string>
-	<key>uuid</key>
-	<string>EF1F2D38-A71A-4D1D-9B07-B1CBB6D84B81</string>
-</dict>
-</plist>
diff --git a/bundles/css.tmbundle/Snippets/Fixed Position Bottom 100% wide IE6.tmSnippet b/bundles/css.tmbundle/Snippets/Fixed Position Bottom 100% wide IE6.tmSnippet
deleted file mode 100644
index 5394b20d5..000000000
--- a/bundles/css.tmbundle/Snippets/Fixed Position Bottom 100% wide IE6.tmSnippet	
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>${2:bottom: auto;}top: expression(eval(document.documentElement.scrollTop+document.documentElement.clientHeight-${1:THE HEIGHT OF THIS THING IN PIXELS}));
-${3:left: expression(eval(document.documentElement.scrollLeft));
-}${4:width: expression(eval(document.documentElement.clientWidth));}$0</string>
-	<key>name</key>
-	<string>Fixed Position Bottom 100% wide IE6</string>
-	<key>scope</key>
-	<string>source.css meta.property-list</string>
-	<key>tabTrigger</key>
-	<string>fixed</string>
-	<key>uuid</key>
-	<string>FCDDB549-681A-436F-894E-1A408C0E114C</string>
-</dict>
-</plist>
diff --git a/bundles/css.tmbundle/Snippets/background-attachment: scroll:fixed (background).plist b/bundles/css.tmbundle/Snippets/background-attachment: scroll:fixed (background).plist
deleted file mode 100644
index 84dfd254a..000000000
--- a/bundles/css.tmbundle/Snippets/background-attachment: scroll:fixed (background).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>background-attachment: ${1|scroll,fixed|};$0</string>
-	<key>name</key>
-	<string>background-attachment: scroll/fixed</string>
-	<key>scope</key>
-	<string>source.css</string>
-	<key>tabTrigger</key>
-	<string>background</string>
-	<key>uuid</key>
-	<string>9E194D74-B73B-4D2B-A89F-51F7468A3E97</string>
-</dict>
-</plist>
diff --git a/bundles/css.tmbundle/Snippets/background-color:  color-hex (background).plist b/bundles/css.tmbundle/Snippets/background-color:  color-hex (background).plist
deleted file mode 100644
index 3513fdb7f..000000000
--- a/bundles/css.tmbundle/Snippets/background-color:  color-hex (background).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>background-color: #${1:DDD};$0</string>
-	<key>name</key>
-	<string>background-color: hex</string>
-	<key>scope</key>
-	<string>source.css</string>
-	<key>tabTrigger</key>
-	<string>background</string>
-	<key>uuid</key>
-	<string>32B7B151-17CB-4DA4-AC0B-7D02BC606403</string>
-</dict>
-</plist>
diff --git a/bundles/css.tmbundle/Snippets/background-color:  color-name (background).plist b/bundles/css.tmbundle/Snippets/background-color:  color-name (background).plist
deleted file mode 100644
index df392cdaa..000000000
--- a/bundles/css.tmbundle/Snippets/background-color:  color-name (background).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>background-color: ${1:red};$0</string>
-	<key>name</key>
-	<string>background-color: name</string>
-	<key>scope</key>
-	<string>source.css</string>
-	<key>tabTrigger</key>
-	<string>background</string>
-	<key>uuid</key>
-	<string>913410E0-623A-43F0-B71F-2E8FB9D5EBC8</string>
-</dict>
-</plist>
diff --git a/bundles/css.tmbundle/Snippets/background-color:  color-rgb (background).plist b/bundles/css.tmbundle/Snippets/background-color:  color-rgb (background).plist
deleted file mode 100644
index c3e9fc15a..000000000
--- a/bundles/css.tmbundle/Snippets/background-color:  color-rgb (background).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>background-color: rgb(${1:255},${2:255},${3:255});$0</string>
-	<key>name</key>
-	<string>background-color: rgb</string>
-	<key>scope</key>
-	<string>source.css</string>
-	<key>tabTrigger</key>
-	<string>background</string>
-	<key>uuid</key>
-	<string>12241B4B-197C-41AF-ACC2-6B9A7AEC7039</string>
-</dict>
-</plist>
diff --git a/bundles/css.tmbundle/Snippets/background-color:  transparent (background).plist b/bundles/css.tmbundle/Snippets/background-color:  transparent (background).plist
deleted file mode 100644
index fffc44abe..000000000
--- a/bundles/css.tmbundle/Snippets/background-color:  transparent (background).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>background-color: transparent;$0</string>
-	<key>name</key>
-	<string>background-color: transparent</string>
-	<key>scope</key>
-	<string>source.css</string>
-	<key>tabTrigger</key>
-	<string>background</string>
-	<key>uuid</key>
-	<string>C71B1388-2815-4CAE-8652-CD159095AEAD</string>
-</dict>
-</plist>
diff --git a/bundles/css.tmbundle/Snippets/background-image:  none (background).plist b/bundles/css.tmbundle/Snippets/background-image:  none (background).plist
deleted file mode 100644
index ede86fd9a..000000000
--- a/bundles/css.tmbundle/Snippets/background-image:  none (background).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>background-image: none;$0</string>
-	<key>name</key>
-	<string>background-image: none</string>
-	<key>scope</key>
-	<string>source.css</string>
-	<key>tabTrigger</key>
-	<string>background</string>
-	<key>uuid</key>
-	<string>7D71DF8B-492E-493D-BD94-1A4AFCCDCBBF</string>
-</dict>
-</plist>
diff --git a/bundles/css.tmbundle/Snippets/background-image:  url (background).plist b/bundles/css.tmbundle/Snippets/background-image:  url (background).plist
deleted file mode 100644
index b4ebbd5c9..000000000
--- a/bundles/css.tmbundle/Snippets/background-image:  url (background).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>background-image: url($1);$0</string>
-	<key>name</key>
-	<string>background-image: url</string>
-	<key>scope</key>
-	<string>source.css</string>
-	<key>tabTrigger</key>
-	<string>background</string>
-	<key>uuid</key>
-	<string>978CBFF6-62D6-45B1-93F7-5644E1C6262B</string>
-</dict>
-</plist>
diff --git a/bundles/css.tmbundle/Snippets/background-position:  position (background).plist b/bundles/css.tmbundle/Snippets/background-position:  position (background).plist
deleted file mode 100644
index 5bf9633dd..000000000
--- a/bundles/css.tmbundle/Snippets/background-position:  position (background).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>background-position: ${1|top left,top center,top right,center left,center center,center right,bottom left,bottom center,bottom right,x-% y-%,x-pos y-pos|};$0</string>
-	<key>name</key>
-	<string>background-position: position</string>
-	<key>scope</key>
-	<string>source.css</string>
-	<key>tabTrigger</key>
-	<string>background</string>
-	<key>uuid</key>
-	<string>E198D2D5-6B52-42FD-BCBC-01B0A7E5E80E</string>
-</dict>
-</plist>
diff --git a/bundles/css.tmbundle/Snippets/background-repeat:  r:r-x:r-y:n-r (background).plist b/bundles/css.tmbundle/Snippets/background-repeat:  r:r-x:r-y:n-r (background).plist
deleted file mode 100644
index ecd8e4569..000000000
--- a/bundles/css.tmbundle/Snippets/background-repeat:  r:r-x:r-y:n-r (background).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>background-repeat: ${1|repeat,repeat-x,repeat-y,no-repeat|};$0</string>
-	<key>name</key>
-	<string>background-repeat: r/r-x/r-y/n-r</string>
-	<key>scope</key>
-	<string>source.css</string>
-	<key>tabTrigger</key>
-	<string>background</string>
-	<key>uuid</key>
-	<string>4EE66583-26BE-4DBA-BD18-8DAF593835F9</string>
-</dict>
-</plist>
diff --git a/bundles/css.tmbundle/Snippets/background:  color image repeat attachment position (background).plist b/bundles/css.tmbundle/Snippets/background:  color image repeat attachment position (background).plist
deleted file mode 100644
index a594029e8..000000000
--- a/bundles/css.tmbundle/Snippets/background:  color image repeat attachment position (background).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>background:${6: #${1:DDD}} url($2) ${3|repeat,repeat-x,repeat-y,no-repeat|} ${4|scroll,fixed|} ${5|top left,top center,top right,center left,center center,center right,bottom left,bottom center,bottom right,x-% y-%,x-pos y-pos|};$0</string>
-	<key>name</key>
-	<string>background: color image repeat attachment position</string>
-	<key>scope</key>
-	<string>source.css</string>
-	<key>tabTrigger</key>
-	<string>background</string>
-	<key>uuid</key>
-	<string>D09967B1-2215-4B10-A331-7A372281DDA6</string>
-</dict>
-</plist>
diff --git a/bundles/css.tmbundle/Snippets/border-bottom-color: size style color (border).plist b/bundles/css.tmbundle/Snippets/border-bottom-color: size style color (border).plist
deleted file mode 100644
index 618a62a30..000000000
--- a/bundles/css.tmbundle/Snippets/border-bottom-color: size style color (border).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>border-bottom-color: #${1:999};$0</string>
-	<key>name</key>
-	<string>border-bottom-color: color</string>
-	<key>scope</key>
-	<string>source.css</string>
-	<key>tabTrigger</key>
-	<string>border</string>
-	<key>uuid</key>
-	<string>05AFB9EB-F4AB-4F86-8170-535CF508176C</string>
-</dict>
-</plist>
diff --git a/bundles/css.tmbundle/Snippets/border-bottom-style: size style color (border).plist b/bundles/css.tmbundle/Snippets/border-bottom-style: size style color (border).plist
deleted file mode 100644
index 26fff89e6..000000000
--- a/bundles/css.tmbundle/Snippets/border-bottom-style: size style color (border).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>border-bottom-style: ${1|none,hidden,dotted,dashed,solid,double,groove,ridge,inset,outset|};$0</string>
-	<key>name</key>
-	<string>border-bottom-style: style</string>
-	<key>scope</key>
-	<string>source.css</string>
-	<key>tabTrigger</key>
-	<string>border</string>
-	<key>uuid</key>
-	<string>39FA441C-3A8F-49D4-BBFE-270B4C962782</string>
-</dict>
-</plist>
diff --git a/bundles/css.tmbundle/Snippets/border-bottom-width: size style color (border).plist b/bundles/css.tmbundle/Snippets/border-bottom-width: size style color (border).plist
deleted file mode 100644
index ac1992df6..000000000
--- a/bundles/css.tmbundle/Snippets/border-bottom-width: size style color (border).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>border-bottom-width: ${1:1}px ${2:solid} #${3:999};$0</string>
-	<key>name</key>
-	<string>border-bottom-width: size</string>
-	<key>scope</key>
-	<string>source.css</string>
-	<key>tabTrigger</key>
-	<string>border</string>
-	<key>uuid</key>
-	<string>6F1126A9-5916-4E6F-8812-AB82C4638B6B</string>
-</dict>
-</plist>
diff --git a/bundles/css.tmbundle/Snippets/border-bottom: size style color (border).plist b/bundles/css.tmbundle/Snippets/border-bottom: size style color (border).plist
deleted file mode 100644
index b6b86d686..000000000
--- a/bundles/css.tmbundle/Snippets/border-bottom: size style color (border).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>border-bottom: ${1:1}px ${2:solid} #${3:999};$0</string>
-	<key>name</key>
-	<string>border-bottom: size style color</string>
-	<key>scope</key>
-	<string>source.css</string>
-	<key>tabTrigger</key>
-	<string>border</string>
-	<key>uuid</key>
-	<string>1998EF7F-D855-4EAF-8CE0-D76CE8C905A4</string>
-</dict>
-</plist>
diff --git a/bundles/css.tmbundle/Snippets/border-color: color (border).plist b/bundles/css.tmbundle/Snippets/border-color: color (border).plist
deleted file mode 100644
index 2af1a3620..000000000
--- a/bundles/css.tmbundle/Snippets/border-color: color (border).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>border-color: ${1:999};$0</string>
-	<key>name</key>
-	<string>border-color: color</string>
-	<key>scope</key>
-	<string>source.css</string>
-	<key>tabTrigger</key>
-	<string>border</string>
-	<key>uuid</key>
-	<string>AB0759F4-4243-4807-B297-2902459EBE02</string>
-</dict>
-</plist>
diff --git a/bundles/css.tmbundle/Snippets/border-left-color: color (border).plist b/bundles/css.tmbundle/Snippets/border-left-color: color (border).plist
deleted file mode 100644
index ff8e233c0..000000000
--- a/bundles/css.tmbundle/Snippets/border-left-color: color (border).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>border-right-color: #${1:999};$0</string>
-	<key>name</key>
-	<string>border-left-color: color</string>
-	<key>scope</key>
-	<string>source.css</string>
-	<key>tabTrigger</key>
-	<string>border</string>
-	<key>uuid</key>
-	<string>189DD463-0331-4B99-8CA2-ADEEF7CC078D</string>
-</dict>
-</plist>
diff --git a/bundles/css.tmbundle/Snippets/border-left-style: style (border).plist b/bundles/css.tmbundle/Snippets/border-left-style: style (border).plist
deleted file mode 100644
index 587cd2b22..000000000
--- a/bundles/css.tmbundle/Snippets/border-left-style: style (border).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>border-left-style: ${1|none,hidden,dotted,dashed,solid,double,groove,ridge,inset,outset|};$0</string>
-	<key>name</key>
-	<string>border-left-style: style</string>
-	<key>scope</key>
-	<string>source.css</string>
-	<key>tabTrigger</key>
-	<string>border</string>
-	<key>uuid</key>
-	<string>8AD77320-0E31-48B9-94A9-982FD8DD1885</string>
-</dict>
-</plist>
diff --git a/bundles/css.tmbundle/Snippets/border-left-width: size (border).plist b/bundles/css.tmbundle/Snippets/border-left-width: size (border).plist
deleted file mode 100644
index 9c3e10b77..000000000
--- a/bundles/css.tmbundle/Snippets/border-left-width: size (border).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>border-left-width: ${1:1}px</string>
-	<key>name</key>
-	<string>border-left-width: size</string>
-	<key>scope</key>
-	<string>source.css</string>
-	<key>tabTrigger</key>
-	<string>border</string>
-	<key>uuid</key>
-	<string>1A667AFE-208F-4697-AD44-3FA1A23AA4C7</string>
-</dict>
-</plist>
diff --git a/bundles/css.tmbundle/Snippets/border-left: size style color (border).plist b/bundles/css.tmbundle/Snippets/border-left: size style color (border).plist
deleted file mode 100644
index 5200b434b..000000000
--- a/bundles/css.tmbundle/Snippets/border-left: size style color (border).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>border-left: ${1:1}px ${2:solid} #${3:999};$0</string>
-	<key>name</key>
-	<string>border-left: size style color</string>
-	<key>scope</key>
-	<string>source.css</string>
-	<key>tabTrigger</key>
-	<string>border</string>
-	<key>uuid</key>
-	<string>BDA03041-39C6-461C-A6F3-F6145D99AB5E</string>
-</dict>
-</plist>
diff --git a/bundles/css.tmbundle/Snippets/border-right-color: color (border).plist b/bundles/css.tmbundle/Snippets/border-right-color: color (border).plist
deleted file mode 100644
index 48c74138a..000000000
--- a/bundles/css.tmbundle/Snippets/border-right-color: color (border).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>border-right-color: #${1:999};$0</string>
-	<key>name</key>
-	<string>border-right-color: color</string>
-	<key>scope</key>
-	<string>source.css</string>
-	<key>tabTrigger</key>
-	<string>border</string>
-	<key>uuid</key>
-	<string>321FFAF7-5699-45E6-8696-DE84AD607690</string>
-</dict>
-</plist>
diff --git a/bundles/css.tmbundle/Snippets/border-right-style: style (border).plist b/bundles/css.tmbundle/Snippets/border-right-style: style (border).plist
deleted file mode 100644
index 1e8ec2f5f..000000000
--- a/bundles/css.tmbundle/Snippets/border-right-style: style (border).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>border-right-style: ${1|none,hidden,dotted,dashed,solid,double,groove,ridge,inset,outset|};$0</string>
-	<key>name</key>
-	<string>border-right-style: style</string>
-	<key>scope</key>
-	<string>source.css</string>
-	<key>tabTrigger</key>
-	<string>border</string>
-	<key>uuid</key>
-	<string>6AE8DB39-F8E2-4DC9-ADBA-460E952439D8</string>
-</dict>
-</plist>
diff --git a/bundles/css.tmbundle/Snippets/border-right-width: size (border).plist b/bundles/css.tmbundle/Snippets/border-right-width: size (border).plist
deleted file mode 100644
index 367d6cf0e..000000000
--- a/bundles/css.tmbundle/Snippets/border-right-width: size (border).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>border-right-width: ${1:1}px</string>
-	<key>name</key>
-	<string>border-right-width: size</string>
-	<key>scope</key>
-	<string>source.css</string>
-	<key>tabTrigger</key>
-	<string>border</string>
-	<key>uuid</key>
-	<string>8B059A97-7F2C-48CD-8422-0ECAB678E8AE</string>
-</dict>
-</plist>
diff --git a/bundles/css.tmbundle/Snippets/border-right: size style color (border).plist b/bundles/css.tmbundle/Snippets/border-right: size style color (border).plist
deleted file mode 100644
index c8a055d4d..000000000
--- a/bundles/css.tmbundle/Snippets/border-right: size style color (border).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>border-right: ${1:1}px ${2:solid} #${3:999};$0</string>
-	<key>name</key>
-	<string>border-right: size style color</string>
-	<key>scope</key>
-	<string>source.css</string>
-	<key>tabTrigger</key>
-	<string>border</string>
-	<key>uuid</key>
-	<string>5FFC4EDE-9AEE-4854-BA78-34BD98BE7FBE</string>
-</dict>
-</plist>
diff --git a/bundles/css.tmbundle/Snippets/border-style: style (border).plist b/bundles/css.tmbundle/Snippets/border-style: style (border).plist
deleted file mode 100644
index 6a948079a..000000000
--- a/bundles/css.tmbundle/Snippets/border-style: style (border).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>border-style: ${1|none,hidden,dotted,dashed,solid,double,groove,ridge,inset,outset|};$0</string>
-	<key>name</key>
-	<string>border-style: style</string>
-	<key>scope</key>
-	<string>source.css</string>
-	<key>tabTrigger</key>
-	<string>border</string>
-	<key>uuid</key>
-	<string>E4BD9171-E053-4EEF-8631-CFC74F1DCB97</string>
-</dict>
-</plist>
diff --git a/bundles/css.tmbundle/Snippets/border-top-color: color (border).plist b/bundles/css.tmbundle/Snippets/border-top-color: color (border).plist
deleted file mode 100644
index 3959cf08b..000000000
--- a/bundles/css.tmbundle/Snippets/border-top-color: color (border).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>border-top-color: #${1:999};$0</string>
-	<key>name</key>
-	<string>border-top-color: color</string>
-	<key>scope</key>
-	<string>source.css</string>
-	<key>tabTrigger</key>
-	<string>border</string>
-	<key>uuid</key>
-	<string>DAF7114F-B5DC-4E70-A7CD-66FF028F93B1</string>
-</dict>
-</plist>
diff --git a/bundles/css.tmbundle/Snippets/border-top-style: style (border).plist b/bundles/css.tmbundle/Snippets/border-top-style: style (border).plist
deleted file mode 100644
index 2c77a170a..000000000
--- a/bundles/css.tmbundle/Snippets/border-top-style: style (border).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>border-top-style: ${1|none,hidden,dotted,dashed,solid,double,groove,ridge,inset,outset|};$0</string>
-	<key>name</key>
-	<string>border-top-style: style</string>
-	<key>scope</key>
-	<string>source.css</string>
-	<key>tabTrigger</key>
-	<string>border</string>
-	<key>uuid</key>
-	<string>C5039010-E264-4D3D-A12E-02C2DB7DC4BF</string>
-</dict>
-</plist>
diff --git a/bundles/css.tmbundle/Snippets/border-top-width: size (border).plist b/bundles/css.tmbundle/Snippets/border-top-width: size (border).plist
deleted file mode 100644
index 437b8f35b..000000000
--- a/bundles/css.tmbundle/Snippets/border-top-width: size (border).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>border-top-width: ${1:1}px</string>
-	<key>name</key>
-	<string>border-top-width: size</string>
-	<key>scope</key>
-	<string>source.css</string>
-	<key>tabTrigger</key>
-	<string>border</string>
-	<key>uuid</key>
-	<string>EE19367C-6634-4854-910D-90C6F5752A46</string>
-</dict>
-</plist>
diff --git a/bundles/css.tmbundle/Snippets/border-top: size style color (border).plist b/bundles/css.tmbundle/Snippets/border-top: size style color (border).plist
deleted file mode 100644
index 434e264d4..000000000
--- a/bundles/css.tmbundle/Snippets/border-top: size style color (border).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>border-top: ${1:1}px ${2:solid} #${3:999};$0</string>
-	<key>name</key>
-	<string>border-top: size style color</string>
-	<key>scope</key>
-	<string>source.css</string>
-	<key>tabTrigger</key>
-	<string>border</string>
-	<key>uuid</key>
-	<string>0FEBF51B-77B0-4D38-9CDB-276744CAF455</string>
-</dict>
-</plist>
diff --git a/bundles/css.tmbundle/Snippets/border-width: width (border).plist b/bundles/css.tmbundle/Snippets/border-width: width (border).plist
deleted file mode 100644
index c691ade14..000000000
--- a/bundles/css.tmbundle/Snippets/border-width: width (border).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>border-width: ${1:1px};$0</string>
-	<key>name</key>
-	<string>border-width: size</string>
-	<key>scope</key>
-	<string>source.css</string>
-	<key>tabTrigger</key>
-	<string>border</string>
-	<key>uuid</key>
-	<string>979C3D46-E8B1-484D-9DBB-E3B1FCD3BCF9</string>
-</dict>
-</plist>
diff --git a/bundles/css.tmbundle/Snippets/border:   size style color (border).plist b/bundles/css.tmbundle/Snippets/border:   size style color (border).plist
deleted file mode 100644
index 68c9c0975..000000000
--- a/bundles/css.tmbundle/Snippets/border:   size style color (border).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>border: ${1:1px} ${2:solid} #${3:999};$0</string>
-	<key>name</key>
-	<string>border: size style color</string>
-	<key>scope</key>
-	<string>source.css</string>
-	<key>tabTrigger</key>
-	<string>border</string>
-	<key>uuid</key>
-	<string>A2EA7266-AE50-4987-A86B-E3C4DFA5B643</string>
-</dict>
-</plist>
diff --git a/bundles/css.tmbundle/Snippets/clear: value (clear).plist b/bundles/css.tmbundle/Snippets/clear: value (clear).plist
deleted file mode 100644
index a8d196bd4..000000000
--- a/bundles/css.tmbundle/Snippets/clear: value (clear).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>clear: ${1|left,right,both,none|};$0</string>
-	<key>name</key>
-	<string>clear: value</string>
-	<key>scope</key>
-	<string>source.css</string>
-	<key>tabTrigger</key>
-	<string>clear</string>
-	<key>uuid</key>
-	<string>8E9366D7-BB0B-456C-B9F3-0CE8072A10C3</string>
-</dict>
-</plist>
diff --git a/bundles/css.tmbundle/Snippets/color:  color-hex (color).plist b/bundles/css.tmbundle/Snippets/color:  color-hex (color).plist
deleted file mode 100644
index 8de93fa8a..000000000
--- a/bundles/css.tmbundle/Snippets/color:  color-hex (color).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>color: #${1:DDD};$0</string>
-	<key>name</key>
-	<string>color: hex</string>
-	<key>scope</key>
-	<string>source.css</string>
-	<key>tabTrigger</key>
-	<string>color</string>
-	<key>uuid</key>
-	<string>D69E7EB0-07E2-48A3-AD32-A7C3E6CAFBBC</string>
-</dict>
-</plist>
diff --git a/bundles/css.tmbundle/Snippets/color:  color-name (color).plist b/bundles/css.tmbundle/Snippets/color:  color-name (color).plist
deleted file mode 100644
index cf517d0a1..000000000
--- a/bundles/css.tmbundle/Snippets/color:  color-name (color).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>color: ${1:red};$0</string>
-	<key>name</key>
-	<string>color: name</string>
-	<key>scope</key>
-	<string>source.css</string>
-	<key>tabTrigger</key>
-	<string>color</string>
-	<key>uuid</key>
-	<string>45D80BAF-0B0A-4334-AFBC-3601B5903707</string>
-</dict>
-</plist>
diff --git a/bundles/css.tmbundle/Snippets/color:  color-rgb (color).plist b/bundles/css.tmbundle/Snippets/color:  color-rgb (color).plist
deleted file mode 100644
index 3cc122aaa..000000000
--- a/bundles/css.tmbundle/Snippets/color:  color-rgb (color).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>color: rgb(${1:255},${2:255},${3:255});$0</string>
-	<key>name</key>
-	<string>color: rgb</string>
-	<key>scope</key>
-	<string>source.css</string>
-	<key>tabTrigger</key>
-	<string>color</string>
-	<key>uuid</key>
-	<string>FBA1210B-33DB-49D0-B026-FF31DBC41FD6</string>
-</dict>
-</plist>
diff --git a/bundles/css.tmbundle/Snippets/cursor: type (cursor).plist b/bundles/css.tmbundle/Snippets/cursor: type (cursor).plist
deleted file mode 100644
index c51029de1..000000000
--- a/bundles/css.tmbundle/Snippets/cursor: type (cursor).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>cursor: ${1|default,auto,crosshair,pointer,move,*-resize,text,wait,help|};$0</string>
-	<key>name</key>
-	<string>cursor: type</string>
-	<key>scope</key>
-	<string>source.css</string>
-	<key>tabTrigger</key>
-	<string>cursor</string>
-	<key>uuid</key>
-	<string>5EDCDB17-5DB0-459A-A61D-29984DD3A3B8</string>
-</dict>
-</plist>
diff --git a/bundles/css.tmbundle/Snippets/cursor: url (cursor).plist b/bundles/css.tmbundle/Snippets/cursor: url (cursor).plist
deleted file mode 100644
index 9d0b4e087..000000000
--- a/bundles/css.tmbundle/Snippets/cursor: url (cursor).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>cursor: url($1);$0</string>
-	<key>name</key>
-	<string>cursor: url</string>
-	<key>scope</key>
-	<string>source.css</string>
-	<key>tabTrigger</key>
-	<string>cursor</string>
-	<key>uuid</key>
-	<string>5C9011B1-B8A8-4FD3-8EA8-848AF6509ADF</string>
-</dict>
-</plist>
diff --git a/bundles/css.tmbundle/Snippets/direction: ltr|rtl (direction).plist b/bundles/css.tmbundle/Snippets/direction: ltr|rtl (direction).plist
deleted file mode 100644
index 8d531cca4..000000000
--- a/bundles/css.tmbundle/Snippets/direction: ltr|rtl (direction).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>direction: ${1:ltr|rtl};$0</string>
-	<key>name</key>
-	<string>direction: ltr/rtl</string>
-	<key>scope</key>
-	<string>source.css</string>
-	<key>tabTrigger</key>
-	<string>direction</string>
-	<key>uuid</key>
-	<string>A723DACA-3819-4E8D-8BCF-9BD1B98AF651</string>
-</dict>
-</plist>
diff --git a/bundles/css.tmbundle/Snippets/display: block (display).plist b/bundles/css.tmbundle/Snippets/display: block (display).plist
deleted file mode 100644
index 64c7a2661..000000000
--- a/bundles/css.tmbundle/Snippets/display: block (display).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>display: block;$0</string>
-	<key>name</key>
-	<string>display: block</string>
-	<key>scope</key>
-	<string>source.css</string>
-	<key>tabTrigger</key>
-	<string>display</string>
-	<key>uuid</key>
-	<string>2FC3C35E-88A6-4DA0-808D-3034A96E7794</string>
-</dict>
-</plist>
diff --git a/bundles/css.tmbundle/Snippets/display: common-types (display).plist b/bundles/css.tmbundle/Snippets/display: common-types (display).plist
deleted file mode 100644
index 4e2cec881..000000000
--- a/bundles/css.tmbundle/Snippets/display: common-types (display).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>display: ${1|none,inline,block,list-item,run-in,compact,marker|};$0</string>
-	<key>name</key>
-	<string>display: common-types</string>
-	<key>scope</key>
-	<string>source.css</string>
-	<key>tabTrigger</key>
-	<string>display</string>
-	<key>uuid</key>
-	<string>56940467-7D99-4F31-83C2-1554638F552A</string>
-</dict>
-</plist>
diff --git a/bundles/css.tmbundle/Snippets/display: inline (display).plist b/bundles/css.tmbundle/Snippets/display: inline (display).plist
deleted file mode 100644
index fdd191e59..000000000
--- a/bundles/css.tmbundle/Snippets/display: inline (display).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>display: inline;$0</string>
-	<key>name</key>
-	<string>display: inline</string>
-	<key>scope</key>
-	<string>source.css</string>
-	<key>tabTrigger</key>
-	<string>display</string>
-	<key>uuid</key>
-	<string>CA506D09-9EAE-445D-AE1E-7058937304B7</string>
-</dict>
-</plist>
diff --git a/bundles/css.tmbundle/Snippets/display: table-types (display).plist b/bundles/css.tmbundle/Snippets/display: table-types (display).plist
deleted file mode 100644
index 2a5747502..000000000
--- a/bundles/css.tmbundle/Snippets/display: table-types (display).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>display: ${1|table,inline-table,table-row-group,table-header-group,table-footer-group,table-row,table-column-group,table-column,table-cell,table-caption|};$0</string>
-	<key>name</key>
-	<string>display: table-types</string>
-	<key>scope</key>
-	<string>source.css</string>
-	<key>tabTrigger</key>
-	<string>display</string>
-	<key>uuid</key>
-	<string>98BE34AD-3CB1-4FB9-98A0-5E5A4BA63286</string>
-</dict>
-</plist>
diff --git a/bundles/css.tmbundle/Snippets/filter: AlphaImageLoader [for IE PNGs] (background).plist b/bundles/css.tmbundle/Snippets/filter: AlphaImageLoader [for IE PNGs] (background).plist
deleted file mode 100644
index 17573738b..000000000
--- a/bundles/css.tmbundle/Snippets/filter: AlphaImageLoader [for IE PNGs] (background).plist	
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>${3:background-image: none;
-}filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='${1:${TM_SELECTED_TEXT:/images/transparent.png}}', sizingMethod='${2|image,scale,crop|}');</string>
-	<key>keyEquivalent</key>
-	<string></string>
-	<key>name</key>
-	<string>filter: AlphaImageLoader [for IE PNGs]</string>
-	<key>scope</key>
-	<string>source.css</string>
-	<key>tabTrigger</key>
-	<string>background</string>
-	<key>uuid</key>
-	<string>81CCEB84-6241-4E4F-BB26-54BAAFA3FF2E</string>
-</dict>
-</plist>
diff --git a/bundles/css.tmbundle/Snippets/float: left:right:none (float).plist b/bundles/css.tmbundle/Snippets/float: left:right:none (float).plist
deleted file mode 100644
index 006fb6b42..000000000
--- a/bundles/css.tmbundle/Snippets/float: left:right:none (float).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>float: ${1|left,right,none|};$0</string>
-	<key>name</key>
-	<string>float: left/right/none</string>
-	<key>scope</key>
-	<string>source.css</string>
-	<key>tabTrigger</key>
-	<string>float</string>
-	<key>uuid</key>
-	<string>39244453-6D06-4265-9894-14D7FC0B277F</string>
-</dict>
-</plist>
diff --git a/bundles/css.tmbundle/Snippets/font-family:   family (font).plist b/bundles/css.tmbundle/Snippets/font-family:   family (font).plist
deleted file mode 100644
index a843a108d..000000000
--- a/bundles/css.tmbundle/Snippets/font-family:   family (font).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>font-family: ${1:Arial, "MS Trebuchet"}, ${2:sans-}serif;$0</string>
-	<key>name</key>
-	<string>font-family: family</string>
-	<key>scope</key>
-	<string>source.css</string>
-	<key>tabTrigger</key>
-	<string>font</string>
-	<key>uuid</key>
-	<string>25388EC7-EA59-4C87-9F11-52870ADBF1AB</string>
-</dict>
-</plist>
diff --git a/bundles/css.tmbundle/Snippets/font-size: size (font).plist b/bundles/css.tmbundle/Snippets/font-size: size (font).plist
deleted file mode 100644
index 53c8b87cb..000000000
--- a/bundles/css.tmbundle/Snippets/font-size: size (font).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>font-size: ${1:100%};$0</string>
-	<key>name</key>
-	<string>font-size: size</string>
-	<key>scope</key>
-	<string>source.css</string>
-	<key>tabTrigger</key>
-	<string>font</string>
-	<key>uuid</key>
-	<string>CD8E3F13-2B14-401D-9646-E309FB04B678</string>
-</dict>
-</plist>
diff --git a/bundles/css.tmbundle/Snippets/font-style:   normal:italic:oblique (font).plist b/bundles/css.tmbundle/Snippets/font-style:   normal:italic:oblique (font).plist
deleted file mode 100644
index 5a4e63ff9..000000000
--- a/bundles/css.tmbundle/Snippets/font-style:   normal:italic:oblique (font).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>font-style: ${1|normal,italic,oblique|};$0</string>
-	<key>name</key>
-	<string>font-style: normal/italic/oblique</string>
-	<key>scope</key>
-	<string>source.css</string>
-	<key>tabTrigger</key>
-	<string>font</string>
-	<key>uuid</key>
-	<string>128D7494-86EA-4615-87F4-C4D45E8C04AA</string>
-</dict>
-</plist>
diff --git a/bundles/css.tmbundle/Snippets/font-variant:   normal:small-caps (font).plist b/bundles/css.tmbundle/Snippets/font-variant:   normal:small-caps (font).plist
deleted file mode 100644
index 397020908..000000000
--- a/bundles/css.tmbundle/Snippets/font-variant:   normal:small-caps (font).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>font-variant: ${1|normal,small-caps|};$0</string>
-	<key>name</key>
-	<string>font-variant: normal/small-caps</string>
-	<key>scope</key>
-	<string>source.css</string>
-	<key>tabTrigger</key>
-	<string>font</string>
-	<key>uuid</key>
-	<string>B6C9A8F9-2942-4592-B73F-2833B9F648E5</string>
-</dict>
-</plist>
diff --git a/bundles/css.tmbundle/Snippets/font-weight: weight (font).plist b/bundles/css.tmbundle/Snippets/font-weight: weight (font).plist
deleted file mode 100644
index 6116fdb77..000000000
--- a/bundles/css.tmbundle/Snippets/font-weight: weight (font).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>font-weight: ${1|normal,bold|};$0</string>
-	<key>name</key>
-	<string>font-weight: weight</string>
-	<key>scope</key>
-	<string>source.css</string>
-	<key>tabTrigger</key>
-	<string>font</string>
-	<key>uuid</key>
-	<string>F2DC92D8-43D4-4044-9D85-D96F734FF81E</string>
-</dict>
-</plist>
diff --git a/bundles/css.tmbundle/Snippets/font:   style variant weight size:line-height font -family (font).plist b/bundles/css.tmbundle/Snippets/font:   style variant weight size:line-height font -family (font).plist
deleted file mode 100644
index 77133561f..000000000
--- a/bundles/css.tmbundle/Snippets/font:   style variant weight size:line-height font -family (font).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>font: ${1|normal,italic,oblique|} ${2|normal,small-caps|} ${3|normal,bold|} ${4|1em,1.5em|} ${5:Arial}, ${6:sans-}serif;$0</string>
-	<key>name</key>
-	<string>font: style variant weight size/line-height font-family</string>
-	<key>scope</key>
-	<string>source.css</string>
-	<key>tabTrigger</key>
-	<string>font</string>
-	<key>uuid</key>
-	<string>30C6CFA2-C00A-4F2A-8770-096A49C3F95F</string>
-</dict>
-</plist>
diff --git a/bundles/css.tmbundle/Snippets/font: size font (font).plist b/bundles/css.tmbundle/Snippets/font: size font (font).plist
deleted file mode 100644
index 404eb01bb..000000000
--- a/bundles/css.tmbundle/Snippets/font: size font (font).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>font: ${1:75%} ${2:"Lucida Grande", "Trebuchet MS", Verdana,} ${3:sans-}serif;$0</string>
-	<key>name</key>
-	<string>font: size font</string>
-	<key>scope</key>
-	<string>source.css</string>
-	<key>tabTrigger</key>
-	<string>font</string>
-	<key>uuid</key>
-	<string>F5EDF655-440B-4E1B-908F-4291F3A0A3A8</string>
-</dict>
-</plist>
diff --git a/bundles/css.tmbundle/Snippets/letter-spacing:   length-em (letter).plist b/bundles/css.tmbundle/Snippets/letter-spacing:   length-em (letter).plist
deleted file mode 100644
index 1499e3380..000000000
--- a/bundles/css.tmbundle/Snippets/letter-spacing:   length-em (letter).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>letter-spacing: $1em;$0</string>
-	<key>name</key>
-	<string>letter-spacing: em</string>
-	<key>scope</key>
-	<string>source.css</string>
-	<key>tabTrigger</key>
-	<string>letter</string>
-	<key>uuid</key>
-	<string>D612A3B7-7C49-4447-9AAF-CCCFDE4408FF</string>
-</dict>
-</plist>
diff --git a/bundles/css.tmbundle/Snippets/letter-spacing:   length-px (letter).plist b/bundles/css.tmbundle/Snippets/letter-spacing:   length-px (letter).plist
deleted file mode 100644
index f37d3065f..000000000
--- a/bundles/css.tmbundle/Snippets/letter-spacing:   length-px (letter).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>letter-spacing: $1px;$0</string>
-	<key>name</key>
-	<string>letter-spacing: px</string>
-	<key>scope</key>
-	<string>source.css</string>
-	<key>tabTrigger</key>
-	<string>letter</string>
-	<key>uuid</key>
-	<string>17BBB1F1-1F83-4386-97B8-23144EB2441A</string>
-</dict>
-</plist>
diff --git a/bundles/css.tmbundle/Snippets/list-style-image: url (list).plist b/bundles/css.tmbundle/Snippets/list-style-image: url (list).plist
deleted file mode 100644
index 5aad4be19..000000000
--- a/bundles/css.tmbundle/Snippets/list-style-image: url (list).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>list-style-image: url($1);$0</string>
-	<key>name</key>
-	<string>list-style-image: url</string>
-	<key>scope</key>
-	<string>source.css</string>
-	<key>tabTrigger</key>
-	<string>list</string>
-	<key>uuid</key>
-	<string>BDEF3B0F-6414-4B1A-8841-864702B51EC6</string>
-</dict>
-</plist>
diff --git a/bundles/css.tmbundle/Snippets/list-style-position: pos (list).plist b/bundles/css.tmbundle/Snippets/list-style-position: pos (list).plist
deleted file mode 100644
index 25d941705..000000000
--- a/bundles/css.tmbundle/Snippets/list-style-position: pos (list).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>list-style-position: ${1|inside,outside|};$0</string>
-	<key>name</key>
-	<string>list-style-position: pos</string>
-	<key>scope</key>
-	<string>source.css</string>
-	<key>tabTrigger</key>
-	<string>list</string>
-	<key>uuid</key>
-	<string>9B10C768-5DA7-4570-98E4-70A36261C823</string>
-</dict>
-</plist>
diff --git a/bundles/css.tmbundle/Snippets/list-style-type: asian (list).plist b/bundles/css.tmbundle/Snippets/list-style-type: asian (list).plist
deleted file mode 100644
index 3ab984eed..000000000
--- a/bundles/css.tmbundle/Snippets/list-style-type: asian (list).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>list-style-type: ${1|cjk-ideographic,hiragana,katakana,hiragana-iroha,katakana-iroha|};$0</string>
-	<key>name</key>
-	<string>list-style-type: asian</string>
-	<key>scope</key>
-	<string>source.css</string>
-	<key>tabTrigger</key>
-	<string>list</string>
-	<key>uuid</key>
-	<string>E024086F-94B8-401F-A903-7F0CDA8E0B8A</string>
-</dict>
-</plist>
diff --git a/bundles/css.tmbundle/Snippets/list-style-type: marker(list).plist b/bundles/css.tmbundle/Snippets/list-style-type: marker(list).plist
deleted file mode 100644
index 2404557dc..000000000
--- a/bundles/css.tmbundle/Snippets/list-style-type: marker(list).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>list-style-type: ${1|none,disc,circle,square|};$0</string>
-	<key>name</key>
-	<string>list-style-type: marker</string>
-	<key>scope</key>
-	<string>source.css</string>
-	<key>tabTrigger</key>
-	<string>list</string>
-	<key>uuid</key>
-	<string>C5CE7E29-9EB1-4A63-8173-190D12E4E4E4</string>
-</dict>
-</plist>
diff --git a/bundles/css.tmbundle/Snippets/list-style-type: numeric (list).plist b/bundles/css.tmbundle/Snippets/list-style-type: numeric (list).plist
deleted file mode 100644
index 023fbecd0..000000000
--- a/bundles/css.tmbundle/Snippets/list-style-type: numeric (list).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>list-style-type: ${1|decimal,decimal-leading-zero,zero|};$0</string>
-	<key>name</key>
-	<string>list-style-type: numeric</string>
-	<key>scope</key>
-	<string>source.css</string>
-	<key>tabTrigger</key>
-	<string>list</string>
-	<key>uuid</key>
-	<string>24436F96-2383-48AB-844F-AE791DEAF080</string>
-</dict>
-</plist>
diff --git a/bundles/css.tmbundle/Snippets/list-style-type: other (list).plist b/bundles/css.tmbundle/Snippets/list-style-type: other (list).plist
deleted file mode 100644
index efc8a00ec..000000000
--- a/bundles/css.tmbundle/Snippets/list-style-type: other (list).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>list-style-type: ${1|hebrew,armenian,georgian|};$0</string>
-	<key>name</key>
-	<string>list-style-type: other</string>
-	<key>scope</key>
-	<string>source.css</string>
-	<key>tabTrigger</key>
-	<string>list</string>
-	<key>uuid</key>
-	<string>B8E9019D-3419-4CC3-87BB-DC54098CBFD0</string>
-</dict>
-</plist>
diff --git a/bundles/css.tmbundle/Snippets/list-style-type: roman-alpha-greek (list).plist b/bundles/css.tmbundle/Snippets/list-style-type: roman-alpha-greek (list).plist
deleted file mode 100644
index 35a7935fb..000000000
--- a/bundles/css.tmbundle/Snippets/list-style-type: roman-alpha-greek (list).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>list-style-type: ${1|lower-roman,upper-roman,lower-alpha,upper-alpha,lower-greek,lower-latin,upper-latin|};$0</string>
-	<key>name</key>
-	<string>list-style-type: roman-alpha-greek</string>
-	<key>scope</key>
-	<string>source.css</string>
-	<key>tabTrigger</key>
-	<string>list</string>
-	<key>uuid</key>
-	<string>97A55488-5DD9-4347-B5F1-722F580715E4</string>
-</dict>
-</plist>
diff --git a/bundles/css.tmbundle/Snippets/list-style: type position image (list).plist b/bundles/css.tmbundle/Snippets/list-style: type position image (list).plist
deleted file mode 100644
index 959a15edf..000000000
--- a/bundles/css.tmbundle/Snippets/list-style: type position image (list).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>list-style: ${1|none,disc,circle,square,decimal,zero|} ${2|inside,outside|} url($3);$0</string>
-	<key>name</key>
-	<string>list-style: type position image</string>
-	<key>scope</key>
-	<string>source.css</string>
-	<key>tabTrigger</key>
-	<string>list</string>
-	<key>uuid</key>
-	<string>1C7E0430-2A67-4CEF-9D68-4ED6315A8567</string>
-</dict>
-</plist>
diff --git a/bundles/css.tmbundle/Snippets/margin-bottom: length (margin).plist b/bundles/css.tmbundle/Snippets/margin-bottom: length (margin).plist
deleted file mode 100644
index fa1fd8cea..000000000
--- a/bundles/css.tmbundle/Snippets/margin-bottom: length (margin).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>margin-bottom: ${1:20px};$0</string>
-	<key>name</key>
-	<string>margin-bottom: length</string>
-	<key>scope</key>
-	<string>source.css</string>
-	<key>tabTrigger</key>
-	<string>margin</string>
-	<key>uuid</key>
-	<string>6354F6AC-74E2-42CF-96B0-7EE2733B9B34</string>
-</dict>
-</plist>
diff --git a/bundles/css.tmbundle/Snippets/margin-left: length (margin).plist b/bundles/css.tmbundle/Snippets/margin-left: length (margin).plist
deleted file mode 100644
index 0555f2808..000000000
--- a/bundles/css.tmbundle/Snippets/margin-left: length (margin).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>margin-left: ${1:20px};$0</string>
-	<key>name</key>
-	<string>margin-left: length</string>
-	<key>scope</key>
-	<string>source.css</string>
-	<key>tabTrigger</key>
-	<string>margin</string>
-	<key>uuid</key>
-	<string>C19985FF-A12C-49B9-9BA3-EDC726E919A0</string>
-</dict>
-</plist>
diff --git a/bundles/css.tmbundle/Snippets/margin-right: length (margin).plist b/bundles/css.tmbundle/Snippets/margin-right: length (margin).plist
deleted file mode 100644
index 33c282a57..000000000
--- a/bundles/css.tmbundle/Snippets/margin-right: length (margin).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>margin-right: ${1:20px};$0</string>
-	<key>name</key>
-	<string>margin-right: length</string>
-	<key>scope</key>
-	<string>source.css</string>
-	<key>tabTrigger</key>
-	<string>margin</string>
-	<key>uuid</key>
-	<string>1FDAB8C2-7A0D-4C0A-97FF-77AD2CC86083</string>
-</dict>
-</plist>
diff --git a/bundles/css.tmbundle/Snippets/margin-top: length (margin).plist b/bundles/css.tmbundle/Snippets/margin-top: length (margin).plist
deleted file mode 100644
index c8da762e9..000000000
--- a/bundles/css.tmbundle/Snippets/margin-top: length (margin).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>margin-top: ${1:20px};$0</string>
-	<key>name</key>
-	<string>margin-top: length</string>
-	<key>scope</key>
-	<string>source.css</string>
-	<key>tabTrigger</key>
-	<string>margin</string>
-	<key>uuid</key>
-	<string>412AA532-762F-4270-961A-54BF6014996D</string>
-</dict>
-</plist>
diff --git a/bundles/css.tmbundle/Snippets/margin:   all (margin).plist b/bundles/css.tmbundle/Snippets/margin:   all (margin).plist
deleted file mode 100644
index 251b7098e..000000000
--- a/bundles/css.tmbundle/Snippets/margin:   all (margin).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>margin: ${1:20px};$0</string>
-	<key>name</key>
-	<string>margin: all</string>
-	<key>scope</key>
-	<string>source.css</string>
-	<key>tabTrigger</key>
-	<string>margin</string>
-	<key>uuid</key>
-	<string>FA3D9F50-C5F6-4193-81D2-98A3E8FFBB2F</string>
-</dict>
-</plist>
diff --git a/bundles/css.tmbundle/Snippets/margin: T R B L (margin).plist b/bundles/css.tmbundle/Snippets/margin: T R B L (margin).plist
deleted file mode 100644
index e014dee2e..000000000
--- a/bundles/css.tmbundle/Snippets/margin: T R B L (margin).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>margin: ${1:20px} ${2:0px} ${3:40px} ${4:0px};$0</string>
-	<key>name</key>
-	<string>margin: T R B L</string>
-	<key>scope</key>
-	<string>source.css</string>
-	<key>tabTrigger</key>
-	<string>margin</string>
-	<key>uuid</key>
-	<string>68A3178C-A024-48BD-ABA6-0A03A69BD82E</string>
-</dict>
-</plist>
diff --git a/bundles/css.tmbundle/Snippets/margin: V H (margin).plist b/bundles/css.tmbundle/Snippets/margin: V H (margin).plist
deleted file mode 100644
index f227fae3c..000000000
--- a/bundles/css.tmbundle/Snippets/margin: V H (margin).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>margin: ${1:20px} ${2:0px};$0</string>
-	<key>name</key>
-	<string>margin: V H</string>
-	<key>scope</key>
-	<string>source.css</string>
-	<key>tabTrigger</key>
-	<string>margin</string>
-	<key>uuid</key>
-	<string>99315B12-6A41-4D8F-8477-F38DE0EBBEF8</string>
-</dict>
-</plist>
diff --git a/bundles/css.tmbundle/Snippets/marker-offset: auto (marker).plist b/bundles/css.tmbundle/Snippets/marker-offset: auto (marker).plist
deleted file mode 100644
index b38730afc..000000000
--- a/bundles/css.tmbundle/Snippets/marker-offset: auto (marker).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>marker-offset: auto;$0</string>
-	<key>name</key>
-	<string>marker-offset: auto</string>
-	<key>scope</key>
-	<string>source.css</string>
-	<key>tabTrigger</key>
-	<string>marker</string>
-	<key>uuid</key>
-	<string>E10366F8-CA83-4447-89D3-B36AFD1EAECD</string>
-</dict>
-</plist>
diff --git a/bundles/css.tmbundle/Snippets/marker-offset: length (marker).plist b/bundles/css.tmbundle/Snippets/marker-offset: length (marker).plist
deleted file mode 100644
index 2351d19f2..000000000
--- a/bundles/css.tmbundle/Snippets/marker-offset: length (marker).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>marker-offset: ${1:10px};$0</string>
-	<key>name</key>
-	<string>marker-offset: length</string>
-	<key>scope</key>
-	<string>source.css</string>
-	<key>tabTrigger</key>
-	<string>marker</string>
-	<key>uuid</key>
-	<string>5FDD30D8-7EF8-41E9-8A44-DC3C22EFD75D</string>
-</dict>
-</plist>
diff --git a/bundles/css.tmbundle/Snippets/opacity: [for Safari, FF and IE] (opacity).plist b/bundles/css.tmbundle/Snippets/opacity: [for Safari, FF and IE] (opacity).plist
deleted file mode 100644
index e965a7189..000000000
--- a/bundles/css.tmbundle/Snippets/opacity: [for Safari, FF and IE] (opacity).plist	
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>opacity: ${1:0.5};${100:
-}-moz-opacity: ${1:0.5};${100:
-}filter:alpha(opacity=${2:${1/(1?)0?\.(.*)/$1$2/}${1/^\d*\.\d\d+$|^\d*$|(^\d\.\d$)/(?1:0)/}});$0</string>
-	<key>name</key>
-	<string>opacity: [for Safari, FF &amp; IE]</string>
-	<key>scope</key>
-	<string>source.css</string>
-	<key>tabTrigger</key>
-	<string>opacity</string>
-	<key>uuid</key>
-	<string>50C748B6-C8B6-447F-A9EE-DD41CF1CD707</string>
-</dict>
-</plist>
diff --git a/bundles/css.tmbundle/Snippets/overflow: type (overflow).plist b/bundles/css.tmbundle/Snippets/overflow: type (overflow).plist
deleted file mode 100644
index 3a253c5f7..000000000
--- a/bundles/css.tmbundle/Snippets/overflow: type (overflow).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>overflow: ${1|visible,hidden,scroll,auto|};$0</string>
-	<key>name</key>
-	<string>overflow: type</string>
-	<key>scope</key>
-	<string>source.css</string>
-	<key>tabTrigger</key>
-	<string>overflow</string>
-	<key>uuid</key>
-	<string>6523B6C5-8741-4766-98D6-1B1DE2E6A5F3</string>
-</dict>
-</plist>
diff --git a/bundles/css.tmbundle/Snippets/padding-bottom: length (margin).plist b/bundles/css.tmbundle/Snippets/padding-bottom: length (margin).plist
deleted file mode 100644
index 4574de649..000000000
--- a/bundles/css.tmbundle/Snippets/padding-bottom: length (margin).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>padding-bottom: ${1:20px};$0</string>
-	<key>name</key>
-	<string>padding-bottom: length</string>
-	<key>scope</key>
-	<string>source.css</string>
-	<key>tabTrigger</key>
-	<string>padding</string>
-	<key>uuid</key>
-	<string>1644E167-7A29-46A7-A100-7BD6C7EFA2F3</string>
-</dict>
-</plist>
diff --git a/bundles/css.tmbundle/Snippets/padding-left: length (margin).plist b/bundles/css.tmbundle/Snippets/padding-left: length (margin).plist
deleted file mode 100644
index c9c984aa9..000000000
--- a/bundles/css.tmbundle/Snippets/padding-left: length (margin).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>padding-left: ${1:20px};$0</string>
-	<key>name</key>
-	<string>padding-left: length</string>
-	<key>scope</key>
-	<string>source.css</string>
-	<key>tabTrigger</key>
-	<string>padding</string>
-	<key>uuid</key>
-	<string>772DD28C-80C2-4C9B-8023-1E71A974E1C4</string>
-</dict>
-</plist>
diff --git a/bundles/css.tmbundle/Snippets/padding-right: length (margin).plist b/bundles/css.tmbundle/Snippets/padding-right: length (margin).plist
deleted file mode 100644
index 4bfe0ad5b..000000000
--- a/bundles/css.tmbundle/Snippets/padding-right: length (margin).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>padding-right: ${1:20px};$0</string>
-	<key>name</key>
-	<string>padding-right: length</string>
-	<key>scope</key>
-	<string>source.css</string>
-	<key>tabTrigger</key>
-	<string>padding</string>
-	<key>uuid</key>
-	<string>C1667E5D-3A50-42F8-8129-6C3EEB43D7C2</string>
-</dict>
-</plist>
diff --git a/bundles/css.tmbundle/Snippets/padding-top: length (margin).plist b/bundles/css.tmbundle/Snippets/padding-top: length (margin).plist
deleted file mode 100644
index 3b4c86a19..000000000
--- a/bundles/css.tmbundle/Snippets/padding-top: length (margin).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>padding-top: ${1:20px};$0</string>
-	<key>name</key>
-	<string>padding-top: length</string>
-	<key>scope</key>
-	<string>source.css</string>
-	<key>tabTrigger</key>
-	<string>padding</string>
-	<key>uuid</key>
-	<string>E5B92C27-8602-4E50-9DF7-DE476E63BA1A</string>
-</dict>
-</plist>
diff --git a/bundles/css.tmbundle/Snippets/padding:   T R B L (padding).plist b/bundles/css.tmbundle/Snippets/padding:   T R B L (padding).plist
deleted file mode 100644
index 7a5596873..000000000
--- a/bundles/css.tmbundle/Snippets/padding:   T R B L (padding).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>padding: ${1:20px} ${2:0px} ${3:40px} ${4:0px};$0</string>
-	<key>name</key>
-	<string>padding: T R B L</string>
-	<key>scope</key>
-	<string>source.css</string>
-	<key>tabTrigger</key>
-	<string>padding</string>
-	<key>uuid</key>
-	<string>DD5BB93D-4F99-4A41-8864-85A557B922C7</string>
-</dict>
-</plist>
diff --git a/bundles/css.tmbundle/Snippets/padding:   V H (padding).plist b/bundles/css.tmbundle/Snippets/padding:   V H (padding).plist
deleted file mode 100644
index e65f8fb97..000000000
--- a/bundles/css.tmbundle/Snippets/padding:   V H (padding).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>padding: ${1:20px} ${2:0px};$0</string>
-	<key>name</key>
-	<string>padding: V H</string>
-	<key>scope</key>
-	<string>source.css</string>
-	<key>tabTrigger</key>
-	<string>padding</string>
-	<key>uuid</key>
-	<string>4602BFF3-C7F1-4CF5-93CE-125EC8ABC7C8</string>
-</dict>
-</plist>
diff --git a/bundles/css.tmbundle/Snippets/padding:   all (padding).plist b/bundles/css.tmbundle/Snippets/padding:   all (padding).plist
deleted file mode 100644
index 4e1a73ec9..000000000
--- a/bundles/css.tmbundle/Snippets/padding:   all (padding).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>padding: ${1:20px};$0</string>
-	<key>name</key>
-	<string>padding: all</string>
-	<key>scope</key>
-	<string>source.css</string>
-	<key>tabTrigger</key>
-	<string>padding</string>
-	<key>uuid</key>
-	<string>6E64EA4A-A10E-49B3-AC9C-D53DBF9ED14A</string>
-</dict>
-</plist>
diff --git a/bundles/css.tmbundle/Snippets/position: type (position).plist b/bundles/css.tmbundle/Snippets/position: type (position).plist
deleted file mode 100644
index ce224ccdf..000000000
--- a/bundles/css.tmbundle/Snippets/position: type (position).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>position: ${1|static,relative,absolute,fixed|};$0</string>
-	<key>name</key>
-	<string>position: type</string>
-	<key>scope</key>
-	<string>source.css</string>
-	<key>tabTrigger</key>
-	<string>position</string>
-	<key>uuid</key>
-	<string>1398502F-D4FD-437B-9033-49E254159BDE</string>
-</dict>
-</plist>
diff --git a/bundles/css.tmbundle/Snippets/properties { } ( } ).plist b/bundles/css.tmbundle/Snippets/properties { } ( } ).plist
deleted file mode 100644
index 8720267a4..000000000
--- a/bundles/css.tmbundle/Snippets/properties { } ( } ).plist	
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>{
-	/* $1 */
-	$0
-</string>
-	<key>name</key>
-	<string>properties { } ( } )</string>
-	<key>scope</key>
-	<string>source.css</string>
-	<key>tabTrigger</key>
-	<string>{</string>
-	<key>uuid</key>
-	<string>0975B58C-C7A1-441E-90E4-C7C413975D42</string>
-</dict>
-</plist>
diff --git a/bundles/css.tmbundle/Snippets/scrollbar.tmSnippet b/bundles/css.tmbundle/Snippets/scrollbar.tmSnippet
deleted file mode 100644
index 56a4e04bd..000000000
--- a/bundles/css.tmbundle/Snippets/scrollbar.tmSnippet
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>scrollbar-base-color:       ${1:#CCCCCC};${2:
-scrollbar-arrow-color:      ${3:#000000};
-scrollbar-track-color:      ${4:#999999};
-scrollbar-3dlight-color:    ${5:#EEEEEE};
-scrollbar-highlight-color:  ${6:#FFFFFF};
-scrollbar-face-color:       ${7:#CCCCCC};
-scrollbar-shadow-color:     ${9:#999999};
-scrollbar-darkshadow-color: ${8:#666666};}</string>
-	<key>name</key>
-	<string>scrollbar</string>
-	<key>scope</key>
-	<string>source.css meta.property-list</string>
-	<key>tabTrigger</key>
-	<string>scrollbar</string>
-	<key>uuid</key>
-	<string>749295F4-F139-422A-80A0-EA11364396E3</string>
-</dict>
-</plist>
diff --git a/bundles/css.tmbundle/Snippets/selection.tmSnippet b/bundles/css.tmbundle/Snippets/selection.tmSnippet
deleted file mode 100644
index 31d6d30a3..000000000
--- a/bundles/css.tmbundle/Snippets/selection.tmSnippet
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>$1::-moz-selection,
-$1::selection {
-	color: ${2:inherit};
-	background: ${3:inherit};
-}</string>
-	<key>name</key>
-	<string>selection</string>
-	<key>scope</key>
-	<string>source.css -meta.property-list</string>
-	<key>tabTrigger</key>
-	<string>selection</string>
-	<key>uuid</key>
-	<string>1B042CEF-7C82-472D-92A2-FF555BFD6927</string>
-</dict>
-</plist>
diff --git a/bundles/css.tmbundle/Snippets/text-align: left:center:right (txt).plist b/bundles/css.tmbundle/Snippets/text-align: left:center:right (txt).plist
deleted file mode 100644
index df7d6755d..000000000
--- a/bundles/css.tmbundle/Snippets/text-align: left:center:right (txt).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>text-align: ${1|left,right,center,justify|};$0</string>
-	<key>name</key>
-	<string>text-align: left/center/right</string>
-	<key>scope</key>
-	<string>source.css</string>
-	<key>tabTrigger</key>
-	<string>text</string>
-	<key>uuid</key>
-	<string>F6CB9433-601A-4F95-A6B9-27D76B50DEE3</string>
-</dict>
-</plist>
diff --git a/bundles/css.tmbundle/Snippets/text-decoration: none:underline:overline:line-through:blink (text).plist b/bundles/css.tmbundle/Snippets/text-decoration: none:underline:overline:line-through:blink (text).plist
deleted file mode 100644
index 5f434bb6d..000000000
--- a/bundles/css.tmbundle/Snippets/text-decoration: none:underline:overline:line-through:blink (text).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>text-decoration: ${1|none,underline,overline,line-through,blink|};$0</string>
-	<key>name</key>
-	<string>text-decoration: none/underline/overline/line-through/blink</string>
-	<key>scope</key>
-	<string>source.css</string>
-	<key>tabTrigger</key>
-	<string>text</string>
-	<key>uuid</key>
-	<string>B1916E73-D417-42C2-A5C1-E95428DA6C45</string>
-</dict>
-</plist>
diff --git a/bundles/css.tmbundle/Snippets/text-indent: length (text).plist b/bundles/css.tmbundle/Snippets/text-indent: length (text).plist
deleted file mode 100644
index 7d771a569..000000000
--- a/bundles/css.tmbundle/Snippets/text-indent: length (text).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>text-indent: ${1:10}px;$0</string>
-	<key>name</key>
-	<string>text-indent: length</string>
-	<key>scope</key>
-	<string>source.css</string>
-	<key>tabTrigger</key>
-	<string>text</string>
-	<key>uuid</key>
-	<string>2CFA68DC-947B-4C43-872C-FB4DC0704D27</string>
-</dict>
-</plist>
diff --git a/bundles/css.tmbundle/Snippets/text-shadow: color-hex x y blur (text).plist b/bundles/css.tmbundle/Snippets/text-shadow: color-hex x y blur (text).plist
deleted file mode 100644
index 6c609417b..000000000
--- a/bundles/css.tmbundle/Snippets/text-shadow: color-hex x y blur (text).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>text-shadow: #${1:DDD} ${2:10px} ${3:10px} ${4:2px};$0</string>
-	<key>name</key>
-	<string>text-shadow: color-hex x y blur</string>
-	<key>scope</key>
-	<string>source.css</string>
-	<key>tabTrigger</key>
-	<string>text</string>
-	<key>uuid</key>
-	<string>77EF6A55-9814-492C-B8E2-EFF0FFAC272E</string>
-</dict>
-</plist>
diff --git a/bundles/css.tmbundle/Snippets/text-shadow: color-rgb x y blur (text).plist b/bundles/css.tmbundle/Snippets/text-shadow: color-rgb x y blur (text).plist
deleted file mode 100644
index 657363d10..000000000
--- a/bundles/css.tmbundle/Snippets/text-shadow: color-rgb x y blur (text).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>text-shadow: rgb(${1:255},${2:255},${3:255}) ${4:10px} ${5:10px} ${6:2px};$0</string>
-	<key>name</key>
-	<string>text-shadow: color-rgb x y blur</string>
-	<key>scope</key>
-	<string>source.css</string>
-	<key>tabTrigger</key>
-	<string>text</string>
-	<key>uuid</key>
-	<string>005905FF-544A-434C-803E-B51689332034</string>
-</dict>
-</plist>
diff --git a/bundles/css.tmbundle/Snippets/text-shadow: none (text).plist b/bundles/css.tmbundle/Snippets/text-shadow: none (text).plist
deleted file mode 100644
index b363e5b9e..000000000
--- a/bundles/css.tmbundle/Snippets/text-shadow: none (text).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>text-shadow: none;$0</string>
-	<key>name</key>
-	<string>text-shadow: none</string>
-	<key>scope</key>
-	<string>source.css</string>
-	<key>tabTrigger</key>
-	<string>text</string>
-	<key>uuid</key>
-	<string>1A6AD6F4-E0F7-406B-B28B-06EC54660650</string>
-</dict>
-</plist>
diff --git a/bundles/css.tmbundle/Snippets/text-transform: capitalize:upper:lower (text).plist b/bundles/css.tmbundle/Snippets/text-transform: capitalize:upper:lower (text).plist
deleted file mode 100644
index 4e8da1a64..000000000
--- a/bundles/css.tmbundle/Snippets/text-transform: capitalize:upper:lower (text).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>text-transform: ${1|capitalize,uppercase,lowercase|};$0</string>
-	<key>name</key>
-	<string>text-transform: capitalize/upper/lower</string>
-	<key>scope</key>
-	<string>source.css</string>
-	<key>tabTrigger</key>
-	<string>text</string>
-	<key>uuid</key>
-	<string>32CD0FA8-7BE7-4D58-A28A-7388F4CF6F9A</string>
-</dict>
-</plist>
diff --git a/bundles/css.tmbundle/Snippets/text-transform: none (text).plist b/bundles/css.tmbundle/Snippets/text-transform: none (text).plist
deleted file mode 100644
index 7420a72a5..000000000
--- a/bundles/css.tmbundle/Snippets/text-transform: none (text).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>text-transform: none;$0</string>
-	<key>name</key>
-	<string>text-transform: none</string>
-	<key>scope</key>
-	<string>source.css</string>
-	<key>tabTrigger</key>
-	<string>text</string>
-	<key>uuid</key>
-	<string>2FF51006-7E07-4296-B89D-5ADF7B9B4232</string>
-</dict>
-</plist>
diff --git a/bundles/css.tmbundle/Snippets/vertical-align: type (vertical).plist b/bundles/css.tmbundle/Snippets/vertical-align: type (vertical).plist
deleted file mode 100644
index a973bf0f1..000000000
--- a/bundles/css.tmbundle/Snippets/vertical-align: type (vertical).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>vertical-align: ${1|baseline,sub,super,top,text-top,middle,bottom,text-bottom,length,%|};$0</string>
-	<key>name</key>
-	<string>vertical-align: type</string>
-	<key>scope</key>
-	<string>source.css</string>
-	<key>tabTrigger</key>
-	<string>vertical</string>
-	<key>uuid</key>
-	<string>0C94F6A6-8AFB-47BC-8448-2383CF0D6C5B</string>
-</dict>
-</plist>
diff --git a/bundles/css.tmbundle/Snippets/visibility: type (visibility).plist b/bundles/css.tmbundle/Snippets/visibility: type (visibility).plist
deleted file mode 100644
index 4f4c98c58..000000000
--- a/bundles/css.tmbundle/Snippets/visibility: type (visibility).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>visibility: ${1|visible,hidden,collapse|};$0</string>
-	<key>name</key>
-	<string>visibility: type</string>
-	<key>scope</key>
-	<string>source.css</string>
-	<key>tabTrigger</key>
-	<string>visibility</string>
-	<key>uuid</key>
-	<string>DE6D5C37-AC74-467E-9029-9844D8F4153A</string>
-</dict>
-</plist>
diff --git a/bundles/css.tmbundle/Snippets/white-space:  normal:pre:nowrap (white).plist b/bundles/css.tmbundle/Snippets/white-space:  normal:pre:nowrap (white).plist
deleted file mode 100644
index ee1f4784c..000000000
--- a/bundles/css.tmbundle/Snippets/white-space:  normal:pre:nowrap (white).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>white-space: ${1|normal,pre,nowrap|};$0</string>
-	<key>name</key>
-	<string>white-space: normal/pre/nowrap</string>
-	<key>scope</key>
-	<string>source.css</string>
-	<key>tabTrigger</key>
-	<string>white</string>
-	<key>uuid</key>
-	<string>A7D10908-72FE-4502-A267-42C5B03F0D66</string>
-</dict>
-</plist>
diff --git a/bundles/css.tmbundle/Snippets/word-spacing:  length (word).plist b/bundles/css.tmbundle/Snippets/word-spacing:  length (word).plist
deleted file mode 100644
index f9a95f7fd..000000000
--- a/bundles/css.tmbundle/Snippets/word-spacing:  length (word).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>word-spacing: ${1:10px};$0</string>
-	<key>name</key>
-	<string>word-spacing: length</string>
-	<key>scope</key>
-	<string>source.css</string>
-	<key>tabTrigger</key>
-	<string>word</string>
-	<key>uuid</key>
-	<string>B121F84A-CE4A-491D-BF3D-35ED51C82554</string>
-</dict>
-</plist>
diff --git a/bundles/css.tmbundle/Snippets/word-spacing:  normal (word).plist b/bundles/css.tmbundle/Snippets/word-spacing:  normal (word).plist
deleted file mode 100644
index 4ecd699ba..000000000
--- a/bundles/css.tmbundle/Snippets/word-spacing:  normal (word).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>word-spacing: normal;$0</string>
-	<key>name</key>
-	<string>word-spacing: normal</string>
-	<key>scope</key>
-	<string>source.css</string>
-	<key>tabTrigger</key>
-	<string>word</string>
-	<key>uuid</key>
-	<string>DA7DF131-7351-4F3B-B680-57159E50E6DE</string>
-</dict>
-</plist>
diff --git a/bundles/css.tmbundle/Snippets/z-index: index (z).plist b/bundles/css.tmbundle/Snippets/z-index: index (z).plist
deleted file mode 100644
index 231123c4e..000000000
--- a/bundles/css.tmbundle/Snippets/z-index: index (z).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>z-index: $1;$0</string>
-	<key>name</key>
-	<string>z-index: index</string>
-	<key>scope</key>
-	<string>source.css</string>
-	<key>tabTrigger</key>
-	<string>z</string>
-	<key>uuid</key>
-	<string>2EED405C-FBAF-4AEB-9B30-ED8EB2252378</string>
-</dict>
-</plist>
diff --git a/bundles/css.tmbundle/Syntaxes/CSS.plist b/bundles/css.tmbundle/Syntaxes/CSS.plist
deleted file mode 100644
index 65ed17563..000000000
--- a/bundles/css.tmbundle/Syntaxes/CSS.plist
+++ /dev/null
@@ -1,1004 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>fileTypes</key>
-	<array>
-		<string>css</string>
-		<string>css.erb</string>
-	</array>
-	<key>keyEquivalent</key>
-	<string>^~C</string>
-	<key>name</key>
-	<string>CSS</string>
-	<key>patterns</key>
-	<array>
-		<dict>
-			<key>include</key>
-			<string>#comment-block</string>
-		</dict>
-		<dict>
-			<key>include</key>
-			<string>#selector</string>
-		</dict>
-		<dict>
-			<key>begin</key>
-			<string>\s*((@)charset\b)\s*</string>
-			<key>captures</key>
-			<dict>
-				<key>1</key>
-				<dict>
-					<key>name</key>
-					<string>keyword.control.at-rule.charset.css</string>
-				</dict>
-				<key>2</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.keyword.css</string>
-				</dict>
-			</dict>
-			<key>end</key>
-			<string>\s*((?=;|$))</string>
-			<key>name</key>
-			<string>meta.at-rule.charset.css</string>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>include</key>
-					<string>#string-double</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>#string-single</string>
-				</dict>
-			</array>
-		</dict>
-		<dict>
-			<key>begin</key>
-			<string>\s*((@)import\b)\s*</string>
-			<key>captures</key>
-			<dict>
-				<key>1</key>
-				<dict>
-					<key>name</key>
-					<string>keyword.control.at-rule.import.css</string>
-				</dict>
-				<key>2</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.keyword.css</string>
-				</dict>
-			</dict>
-			<key>end</key>
-			<string>\s*((?=;|\}))</string>
-			<key>name</key>
-			<string>meta.at-rule.import.css</string>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>include</key>
-					<string>#string-double</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>#string-single</string>
-				</dict>
-				<dict>
-					<key>begin</key>
-					<string>\s*(url)\s*(\()\s*</string>
-					<key>beginCaptures</key>
-					<dict>
-						<key>1</key>
-						<dict>
-							<key>name</key>
-							<string>support.function.url.css</string>
-						</dict>
-						<key>2</key>
-						<dict>
-							<key>name</key>
-							<string>punctuation.section.function.css</string>
-						</dict>
-					</dict>
-					<key>end</key>
-					<string>\s*(\))\s*</string>
-					<key>endCaptures</key>
-					<dict>
-						<key>1</key>
-						<dict>
-							<key>name</key>
-							<string>punctuation.section.function.css</string>
-						</dict>
-					</dict>
-					<key>patterns</key>
-					<array>
-						<dict>
-							<key>match</key>
-							<string>[^'") \t]+</string>
-							<key>name</key>
-							<string>variable.parameter.url.css</string>
-						</dict>
-						<dict>
-							<key>include</key>
-							<string>#string-single</string>
-						</dict>
-						<dict>
-							<key>include</key>
-							<string>#string-double</string>
-						</dict>
-					</array>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>#media-query-list</string>
-				</dict>
-			</array>
-		</dict>
-		<dict>
-			<key>begin</key>
-			<string>^\s*((@)font-face)\s*(?=\{)</string>
-			<key>beginCaptures</key>
-			<dict>
-				<key>1</key>
-				<dict>
-					<key>name</key>
-					<string>keyword.control.at-rule.font-face.css</string>
-				</dict>
-				<key>2</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.keyword.css</string>
-				</dict>
-			</dict>
-			<key>end</key>
-			<string>\s*(\})</string>
-			<key>endCaptures</key>
-			<dict>
-				<key>1</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.section.property-list.css</string>
-				</dict>
-			</dict>
-			<key>name</key>
-			<string>meta.at-rule.font-face.css</string>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>include</key>
-					<string>#rule-list</string>
-				</dict>
-			</array>
-		</dict>
-		<dict>
-			<key>begin</key>
-			<string>(?=^\s*@media\s*.*?\{)</string>
-			<key>end</key>
-			<string>\s*(\})</string>
-			<key>endCaptures</key>
-			<dict>
-				<key>1</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.section.property-list.css</string>
-				</dict>
-			</dict>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>begin</key>
-					<string>^\s*((@)media)(?=.*?\{)</string>
-					<key>beginCaptures</key>
-					<dict>
-						<key>1</key>
-						<dict>
-							<key>name</key>
-							<string>keyword.control.at-rule.media.css</string>
-						</dict>
-						<key>2</key>
-						<dict>
-							<key>name</key>
-							<string>punctuation.definition.keyword.css</string>
-						</dict>
-						<key>3</key>
-						<dict>
-							<key>name</key>
-							<string>support.constant.media.css</string>
-						</dict>
-					</dict>
-					<key>end</key>
-					<string>\s*(?=\{)</string>
-					<key>name</key>
-					<string>meta.at-rule.media.css</string>
-					<key>patterns</key>
-					<array>
-						<dict>
-							<key>include</key>
-							<string>#media-query-list</string>
-						</dict>
-					</array>
-				</dict>
-				<dict>
-					<key>begin</key>
-					<string>\s*(\{)</string>
-					<key>beginCaptures</key>
-					<dict>
-						<key>1</key>
-						<dict>
-							<key>name</key>
-							<string>punctuation.section.property-list.css</string>
-						</dict>
-					</dict>
-					<key>end</key>
-					<string>(?=\})</string>
-					<key>patterns</key>
-					<array>
-						<dict>
-							<key>include</key>
-							<string>$self</string>
-						</dict>
-					</array>
-				</dict>
-			</array>
-		</dict>
-		<dict>
-			<key>begin</key>
-			<string>(?=\{)</string>
-			<key>end</key>
-			<string>(\})</string>
-			<key>endCaptures</key>
-			<dict>
-				<key>1</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.section.property-list.css</string>
-				</dict>
-			</dict>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>include</key>
-					<string>#rule-list</string>
-				</dict>
-			</array>
-		</dict>
-	</array>
-	<key>repository</key>
-	<dict>
-		<key>color-values</key>
-		<dict>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>comment</key>
-					<string>http://www.w3.org/TR/CSS21/syndata.html#value-def-color</string>
-					<key>match</key>
-					<string>\b(aqua|black|blue|fuchsia|gray|green|lime|maroon|navy|olive|orange|purple|red|silver|teal|white|yellow)\b</string>
-					<key>name</key>
-					<string>support.constant.color.w3c-standard-color-name.css</string>
-				</dict>
-				<dict>
-					<key>comment</key>
-					<string>These colours are mostly recognised but will not validate. ref: http://www.w3schools.com/css/css_colornames.asp</string>
-					<key>match</key>
-					<string>\b(aliceblue|antiquewhite|aquamarine|azure|beige|bisque|blanchedalmond|blueviolet|brown|burlywood|cadetblue|chartreuse|chocolate|coral|cornflowerblue|cornsilk|crimson|cyan|darkblue|darkcyan|darkgoldenrod|darkgray|darkgreen|darkgrey|darkkhaki|darkmagenta|darkolivegreen|darkorange|darkorchid|darkred|darksalmon|darkseagreen|darkslateblue|darkslategray|darkslategrey|darkturquoise|darkviolet|deeppink|deepskyblue|dimgray|dimgrey|dodgerblue|firebrick|floralwhite|forestgreen|gainsboro|ghostwhite|gold|goldenrod|greenyellow|grey|honeydew|hotpink|indianred|indigo|ivory|khaki|lavender|lavenderblush|lawngreen|lemonchiffon|lightblue|lightcoral|lightcyan|lightgoldenrodyellow|lightgray|lightgreen|lightgrey|lightpink|lightsalmon|lightseagreen|lightskyblue|lightslategray|lightslategrey|lightsteelblue|lightyellow|limegreen|linen|magenta|mediumaquamarine|mediumblue|mediumorchid|mediumpurple|mediumseagreen|mediumslateblue|mediumspringgreen|mediumturquoise|mediumvioletred|midnightblue|mintcream|mistyrose|moccasin|navajowhite|oldlace|olivedrab|orangered|orchid|palegoldenrod|palegreen|paleturquoise|palevioletred|papayawhip|peachpuff|peru|pink|plum|powderblue|rosybrown|royalblue|saddlebrown|salmon|sandybrown|seagreen|seashell|sienna|skyblue|slateblue|slategray|slategrey|snow|springgreen|steelblue|tan|thistle|tomato|turquoise|violet|wheat|whitesmoke|yellowgreen)\b</string>
-					<key>name</key>
-					<string>invalid.deprecated.color.w3c-non-standard-color-name.css</string>
-				</dict>
-				<dict>
-					<key>begin</key>
-					<string>(hsla?|rgba?)\s*(\()</string>
-					<key>beginCaptures</key>
-					<dict>
-						<key>1</key>
-						<dict>
-							<key>name</key>
-							<string>support.function.misc.css</string>
-						</dict>
-						<key>2</key>
-						<dict>
-							<key>name</key>
-							<string>punctuation.section.function.css</string>
-						</dict>
-					</dict>
-					<key>end</key>
-					<string>(\))</string>
-					<key>endCaptures</key>
-					<dict>
-						<key>1</key>
-						<dict>
-							<key>name</key>
-							<string>punctuation.section.function.css</string>
-						</dict>
-					</dict>
-					<key>patterns</key>
-					<array>
-						<dict>
-							<key>match</key>
-							<string>(?x)\b
-							    (0*((1?[0-9]{1,2})|(2([0-4][0-9]|5[0-5])))\s*,\s*){2}
-							    (0*((1?[0-9]{1,2})|(2([0-4][0-9]|5[0-5])))\b)
-							    (\s*,\s*((0?\.[0-9]+)|[0-1]))?
-							</string>
-							<key>name</key>
-							<string>constant.other.color.rgb-value.css</string>
-						</dict>
-						<dict>
-							<key>match</key>
-							<string>\b([0-9]{1,2}|100)\s*%,\s*([0-9]{1,2}|100)\s*%,\s*([0-9]{1,2}|100)\s*%</string>
-							<key>name</key>
-							<string>constant.other.color.rgb-percentage.css</string>
-						</dict>
-						<dict>
-							<key>include</key>
-							<string>#numeric-values</string>
-						</dict>
-					</array>
-				</dict>
-			</array>
-		</dict>
-		<key>comment-block</key>
-		<dict>
-			<key>begin</key>
-			<string>/\*</string>
-			<key>captures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.comment.css</string>
-				</dict>
-			</dict>
-			<key>end</key>
-			<string>\*/</string>
-			<key>name</key>
-			<string>comment.block.css</string>
-		</dict>
-		<key>media-query</key>
-		<dict>
-			<key>begin</key>
-			<string>(?i)\s*(only|not)?\s*(all|aural|braille|embossed|handheld|print|projection|screen|tty|tv)?</string>
-			<key>beginCaptures</key>
-			<dict>
-				<key>1</key>
-				<dict>
-					<key>name</key>
-					<string>keyword.operator.logic.media.css</string>
-				</dict>
-				<key>2</key>
-				<dict>
-					<key>name</key>
-					<string>support.constant.media.css</string>
-				</dict>
-			</dict>
-			<key>end</key>
-			<string>\s*(?:(,)|(?=[{;]))</string>
-			<key>endCaptures</key>
-			<dict>
-				<key>1</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.arbitrary-repitition.css</string>
-				</dict>
-			</dict>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>begin</key>
-					<string>\s*(and)?\s*(\()\s*</string>
-					<key>beginCaptures</key>
-					<dict>
-						<key>1</key>
-						<dict>
-							<key>name</key>
-							<string>keyword.operator.logic.media.css</string>
-						</dict>
-					</dict>
-					<key>end</key>
-					<string>\)</string>
-					<key>patterns</key>
-					<array>
-						<dict>
-							<key>begin</key>
-							<string>(?x)
-	                            (
-	                                ((min|max)-)?
-	                                (
-	                                    ((device-)?(height|width|aspect-ratio))|
-	                                    (color(-index)?)|monochrome|resolution
-	                                )
-	                            )|grid|scan|orientation
-	                            \s*(?=[:)])</string>
-							<key>beginCaptures</key>
-							<dict>
-								<key>0</key>
-								<dict>
-									<key>name</key>
-									<string>support.type.property-name.media.css</string>
-								</dict>
-							</dict>
-							<key>end</key>
-							<string>(:)|(?=\))</string>
-							<key>endCaptures</key>
-							<dict>
-								<key>1</key>
-								<dict>
-									<key>name</key>
-									<string>punctuation.separator.key-value.css</string>
-								</dict>
-							</dict>
-						</dict>
-						<dict>
-							<key>match</key>
-							<string>\b(portrait|landscape|progressive|interlace)</string>
-							<key>name</key>
-							<string>support.constant.property-value.css</string>
-						</dict>
-						<dict>
-							<key>captures</key>
-							<dict>
-								<key>1</key>
-								<dict>
-									<key>name</key>
-									<string>constant.numeric.css</string>
-								</dict>
-								<key>2</key>
-								<dict>
-									<key>name</key>
-									<string>keyword.operator.arithmetic.css</string>
-								</dict>
-								<key>3</key>
-								<dict>
-									<key>name</key>
-									<string>constant.numeric.css</string>
-								</dict>
-							</dict>
-							<key>match</key>
-							<string>\s*(\d+)(/)(\d+)</string>
-						</dict>
-						<dict>
-							<key>include</key>
-							<string>#numeric-values</string>
-						</dict>
-					</array>
-				</dict>
-			</array>
-		</dict>
-		<key>media-query-list</key>
-		<dict>
-			<key>begin</key>
-			<string>\s*(?=[^{;])</string>
-			<key>end</key>
-			<string>\s*(?=[{;])</string>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>include</key>
-					<string>#media-query</string>
-				</dict>
-			</array>
-		</dict>
-		<key>numeric-values</key>
-		<dict>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>captures</key>
-					<dict>
-						<key>1</key>
-						<dict>
-							<key>name</key>
-							<string>punctuation.definition.constant.css</string>
-						</dict>
-					</dict>
-					<key>match</key>
-					<string>(#)([0-9a-fA-F]{3}|[0-9a-fA-F]{6})\b</string>
-					<key>name</key>
-					<string>constant.other.color.rgb-value.css</string>
-				</dict>
-				<dict>
-					<key>captures</key>
-					<dict>
-						<key>1</key>
-						<dict>
-							<key>name</key>
-							<string>keyword.other.unit.css</string>
-						</dict>
-					</dict>
-					<key>match</key>
-					<string>(?x)
-					    (?:-|\+)?(?:(?:[0-9]+(?:\.[0-9]+)?)|(?:\.[0-9]+))
-					    ((?:px|pt|ch|cm|mm|in|r?em|ex|pc|deg|g?rad|dpi|dpcm|s)\b|%)?
-					</string>
-					<key>name</key>
-					<string>constant.numeric.css</string>
-				</dict>
-			</array>
-		</dict>
-		<key>property-values</key>
-		<dict>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>match</key>
-					<string>\b(absolute|all(-scroll)?|always|armenian|auto|avoid|baseline|below|bidi-override|block|bold|bolder|both|bottom|break-all|break-word|capitalize|center|char|circle|cjk-ideographic|col-resize|collapse|crosshair|dashed|decimal-leading-zero|decimal|default|disabled|disc|distribute-all-lines|distribute-letter|distribute-space|distribute|dotted|double|e-resize|ellipsis|fixed|geometricPrecision|georgian|groove|hand|hebrew|help|hidden|hiragana-iroha|hiragana|horizontal|ideograph-alpha|ideograph-numeric|ideograph-parenthesis|ideograph-space|inactive|inherit|inline-block|inline|inset|inside|inter-ideograph|inter-word|italic|justify|katakana-iroha|katakana|keep-all|left|lighter|line-edge|line-through|line|list-item|loose|lower-alpha|lower-greek|lower-latin|lower-roman|lowercase|lr-tb|ltr|medium|middle|move|n-resize|ne-resize|newspaper|no-drop|no-repeat|nw-resize|none|normal|not-allowed|nowrap|oblique|optimize(Legibility|Quality|Speed)|outset|outside|overline|pointer|pre(-(wrap|line))?|progress|relative|repeat-x|repeat-y|repeat|right|ridge|row-resize|rtl|s-resize|scroll|se-resize|separate|small-caps|solid|square|static|strict|sub|super|sw-resize|table-footer-group|table-header-group|tb-rl|text-bottom|text-top|text|thick|thin|top|transparent|underline|upper-alpha|upper-latin|upper-roman|uppercase|vertical(-(ideographic|text))?|visible(Painted|Fill|Stroke)?|w-resize|wait|whitespace|zero|smaller|larger|((xx?-)?(small|large))|painted|fill|stroke)\b</string>
-					<key>name</key>
-					<string>support.constant.property-value.css</string>
-				</dict>
-				<dict>
-					<key>match</key>
-					<string>(\b(?i:arial|century|comic|courier|garamond|georgia|helvetica|impact|lucida|symbol|system|tahoma|times|trebuchet|utopia|verdana|webdings|sans-serif|serif|monospace)\b)</string>
-					<key>name</key>
-					<string>support.constant.font-name.css</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>#numeric-values</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>#color-values</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>#string-double</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>#string-single</string>
-				</dict>
-				<dict>
-					<key>begin</key>
-					<string>(rect)\s*(\()</string>
-					<key>beginCaptures</key>
-					<dict>
-						<key>1</key>
-						<dict>
-							<key>name</key>
-							<string>support.function.misc.css</string>
-						</dict>
-						<key>2</key>
-						<dict>
-							<key>name</key>
-							<string>punctuation.section.function.css</string>
-						</dict>
-					</dict>
-					<key>end</key>
-					<string>(\))</string>
-					<key>endCaptures</key>
-					<dict>
-						<key>1</key>
-						<dict>
-							<key>name</key>
-							<string>punctuation.section.function.css</string>
-						</dict>
-					</dict>
-					<key>patterns</key>
-					<array>
-						<dict>
-							<key>include</key>
-							<string>#numeric-values</string>
-						</dict>
-					</array>
-				</dict>
-				<dict>
-					<key>begin</key>
-					<string>(format|local|url|attr|counter|counters)\s*(\()</string>
-					<key>beginCaptures</key>
-					<dict>
-						<key>1</key>
-						<dict>
-							<key>name</key>
-							<string>support.function.misc.css</string>
-						</dict>
-						<key>2</key>
-						<dict>
-							<key>name</key>
-							<string>punctuation.section.function.css</string>
-						</dict>
-					</dict>
-					<key>end</key>
-					<string>(\))</string>
-					<key>endCaptures</key>
-					<dict>
-						<key>1</key>
-						<dict>
-							<key>name</key>
-							<string>punctuation.section.function.css</string>
-						</dict>
-					</dict>
-					<key>patterns</key>
-					<array>
-						<dict>
-							<key>include</key>
-							<string>#string-single</string>
-						</dict>
-						<dict>
-							<key>include</key>
-							<string>#string-double</string>
-						</dict>
-						<dict>
-							<key>match</key>
-							<string>[^'") \t]+</string>
-							<key>name</key>
-							<string>variable.parameter.misc.css</string>
-						</dict>
-					</array>
-				</dict>
-				<dict>
-					<key>match</key>
-					<string>\!\s*important</string>
-					<key>name</key>
-					<string>keyword.other.important.css</string>
-				</dict>
-			</array>
-		</dict>
-		<key>rule-list</key>
-		<dict>
-			<key>begin</key>
-			<string>\{</string>
-			<key>beginCaptures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.section.property-list.css</string>
-				</dict>
-			</dict>
-			<key>end</key>
-			<string>(?=\s*\})</string>
-			<key>name</key>
-			<string>meta.property-list.css</string>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>include</key>
-					<string>#comment-block</string>
-				</dict>
-				<dict>
-					<key>begin</key>
-					<string>(?&lt;![-a-z])(?=[-a-z])</string>
-					<key>end</key>
-					<string>$|(?![-a-z])</string>
-					<key>name</key>
-					<string>meta.property-name.css</string>
-					<key>patterns</key>
-					<array>
-						<dict>
-							<key>match</key>
-							<string>\b(azimuth|background-attachment|background-color|background-image|background-position|background-repeat|background|box-shadow|border-radius|border-bottom-color|border-bottom-style|border-bottom-width|border-bottom|border-collapse|border-color|border-left-color|border-left-style|border-left-width|border-left|border-right-color|border-right-style|border-right-width|border-right|border-spacing|border-style|border-top-color|border-top-style|border-top-width|border-top|border-width|border|bottom|caption-side|clear|clip|color|content|counter-increment|counter-reset|cue-after|cue-before|cue|cursor|direction|display|elevation|empty-cells|float|font-family|font-size-adjust|font-size|font-stretch|font-style|font-variant|font-weight|font|height|image-rendering|left|letter-spacing|line-height|list-style-image|list-style-position|list-style-type|list-style|margin-bottom|margin-left|margin-right|margin-top|marker-offset|margin|marks|max-height|max-width|min-height|min-width|-moz-border-radius|opacity|orphans|outline-color|outline-style|outline-width|outline|overflow(-[xy])?|padding-bottom|padding-left|padding-right|padding-top|padding|page-break-after|page-break-before|page-break-inside|page|pause-after|pause-before|pause|pitch-range|pitch|play-during|pointer-events|position|quotes|resize|richness|right|size|speak-header|speak-numeral|speak-punctuation|speech-rate|speak|src|stress|table-layout|text-(align|decoration|indent|rendering|shadow|transform)|top|unicode-bidi|vertical-align|visibility|voice-family|volume|white-space|widows|width|word-(spacing|wrap)|zoom|z-index)\b</string>
-							<key>name</key>
-							<string>support.type.property-name.css</string>
-						</dict>
-					</array>
-				</dict>
-				<dict>
-					<key>begin</key>
-					<string>(:)\s*</string>
-					<key>beginCaptures</key>
-					<dict>
-						<key>1</key>
-						<dict>
-							<key>name</key>
-							<string>punctuation.separator.key-value.css</string>
-						</dict>
-					</dict>
-					<key>end</key>
-					<string>\s*(;|(?=\}))</string>
-					<key>endCaptures</key>
-					<dict>
-						<key>1</key>
-						<dict>
-							<key>name</key>
-							<string>punctuation.terminator.rule.css</string>
-						</dict>
-					</dict>
-					<key>name</key>
-					<string>meta.property-value.css</string>
-					<key>patterns</key>
-					<array>
-						<dict>
-							<key>include</key>
-							<string>#property-values</string>
-						</dict>
-					</array>
-				</dict>
-			</array>
-		</dict>
-		<key>selector</key>
-		<dict>
-			<key>begin</key>
-			<string>\s*(?=[:.*#a-zA-Z])</string>
-			<key>end</key>
-			<string>(?=[/@{)])</string>
-			<key>name</key>
-			<string>meta.selector.css</string>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>match</key>
-					<string>\b(a|abbr|acronym|address|area|article|aside|audio|b|base|big|blockquote|body|br|button|canvas|caption|cite|code|col|colgroup|datalist|dd|del|details|dfn|dialog|div|dl|dt|em|eventsource|fieldset|figure|figcaption|footer|form|frame|frameset|(h[1-6])|head|header|hgroup|hr|html|i|iframe|img|input|ins|kbd|label|legend|li|link|map|mark|menu|meta|meter|nav|noframes|noscript|object|ol|optgroup|option|output|p|param|pre|progress|q|samp|script|section|select|small|span|strike|strong|style|sub|summary|sup|table|tbody|td|textarea|tfoot|th|thead|time|title|tr|tt|ul|var|video)\b</string>
-					<key>name</key>
-					<string>entity.name.tag.css</string>
-				</dict>
-				<dict>
-					<key>captures</key>
-					<dict>
-						<key>1</key>
-						<dict>
-							<key>name</key>
-							<string>punctuation.definition.entity.css</string>
-						</dict>
-					</dict>
-					<key>match</key>
-					<string>(\.)[a-zA-Z0-9_-]+</string>
-					<key>name</key>
-					<string>entity.other.attribute-name.class.css</string>
-				</dict>
-				<dict>
-					<key>captures</key>
-					<dict>
-						<key>1</key>
-						<dict>
-							<key>name</key>
-							<string>punctuation.definition.entity.css</string>
-						</dict>
-					</dict>
-					<key>match</key>
-					<string>(#)[a-zA-Z][a-zA-Z0-9_-]*</string>
-					<key>name</key>
-					<string>entity.other.attribute-name.id.css</string>
-				</dict>
-				<dict>
-					<key>match</key>
-					<string>\*</string>
-					<key>name</key>
-					<string>entity.name.tag.wildcard.css</string>
-				</dict>
-				<dict>
-					<key>captures</key>
-					<dict>
-						<key>1</key>
-						<dict>
-							<key>name</key>
-							<string>punctuation.definition.entity.css</string>
-						</dict>
-					</dict>
-					<key>match</key>
-					<string>(:+)(after|before|first-letter|first-line|selection)\b</string>
-					<key>name</key>
-					<string>entity.other.attribute-name.pseudo-element.css</string>
-				</dict>
-				<dict>
-					<key>captures</key>
-					<dict>
-						<key>1</key>
-						<dict>
-							<key>name</key>
-							<string>punctuation.definition.entity.css</string>
-						</dict>
-					</dict>
-					<key>match</key>
-					<string>(:)((first|last)-child|(first|last|only)-of-type|empty|root|target|first|left|right)\b</string>
-					<key>name</key>
-					<string>entity.other.attribute-name.pseudo-class.css</string>
-				</dict>
-				<dict>
-					<key>captures</key>
-					<dict>
-						<key>1</key>
-						<dict>
-							<key>name</key>
-							<string>punctuation.definition.entity.css</string>
-						</dict>
-					</dict>
-					<key>match</key>
-					<string>(:)(checked|enabled|default|disabled|indeterminate|invalid|optional|required|valid)\b</string>
-					<key>name</key>
-					<string>entity.other.attribute-name.pseudo-class.ui-state.css</string>
-				</dict>
-				<dict>
-					<key>begin</key>
-					<string>((:)not)(\()</string>
-					<key>beginCaptures</key>
-					<dict>
-						<key>1</key>
-						<dict>
-							<key>name</key>
-							<string>entity.other.attribute-name.pseudo-class.css</string>
-						</dict>
-						<key>2</key>
-						<dict>
-							<key>name</key>
-							<string>punctuation.definition.entity.css</string>
-						</dict>
-						<key>3</key>
-						<dict>
-							<key>name</key>
-							<string>punctuation.section.function.css</string>
-						</dict>
-					</dict>
-					<key>end</key>
-					<string>\)</string>
-					<key>endCaptures</key>
-					<dict>
-						<key>0</key>
-						<dict>
-							<key>name</key>
-							<string>punctuation.section.function.css</string>
-						</dict>
-					</dict>
-					<key>patterns</key>
-					<array>
-						<dict>
-							<key>include</key>
-							<string>#selector</string>
-						</dict>
-					</array>
-				</dict>
-				<dict>
-					<key>captures</key>
-					<dict>
-						<key>1</key>
-						<dict>
-							<key>name</key>
-							<string>entity.other.attribute-name.pseudo-class.css</string>
-						</dict>
-						<key>2</key>
-						<dict>
-							<key>name</key>
-							<string>punctuation.definition.entity.css</string>
-						</dict>
-						<key>3</key>
-						<dict>
-							<key>name</key>
-							<string>punctuation.section.function.css</string>
-						</dict>
-						<key>4</key>
-						<dict>
-							<key>name</key>
-							<string>constant.numeric.css</string>
-						</dict>
-						<key>5</key>
-						<dict>
-							<key>name</key>
-							<string>punctuation.section.function.css</string>
-						</dict>
-					</dict>
-					<key>match</key>
-					<string>((:)nth-(?:(?:last-)?child|(?:last-)?of-type))(\()(\-?(?:\d+n?|n)(?:\+\d+)?|even|odd)(\))</string>
-				</dict>
-				<dict>
-					<key>captures</key>
-					<dict>
-						<key>1</key>
-						<dict>
-							<key>name</key>
-							<string>punctuation.definition.entity.css</string>
-						</dict>
-					</dict>
-					<key>match</key>
-					<string>(:)(active|hover|link|visited|focus)\b</string>
-					<key>name</key>
-					<string>entity.other.attribute-name.pseudo-class.css</string>
-				</dict>
-				<dict>
-					<key>captures</key>
-					<dict>
-						<key>1</key>
-						<dict>
-							<key>name</key>
-							<string>punctuation.definition.entity.css</string>
-						</dict>
-						<key>2</key>
-						<dict>
-							<key>name</key>
-							<string>entity.other.attribute-name.attribute.css</string>
-						</dict>
-						<key>3</key>
-						<dict>
-							<key>name</key>
-							<string>punctuation.separator.operator.css</string>
-						</dict>
-						<key>4</key>
-						<dict>
-							<key>name</key>
-							<string>string.unquoted.attribute-value.css</string>
-						</dict>
-						<key>5</key>
-						<dict>
-							<key>name</key>
-							<string>string.quoted.double.attribute-value.css</string>
-						</dict>
-						<key>6</key>
-						<dict>
-							<key>name</key>
-							<string>punctuation.definition.string.begin.css</string>
-						</dict>
-						<key>7</key>
-						<dict>
-							<key>name</key>
-							<string>punctuation.definition.string.end.css</string>
-						</dict>
-					</dict>
-					<key>match</key>
-					<string>(?i)(\[)\s*(-?[_a-z\\[[:^ascii:]]][_a-z0-9\-\\[[:^ascii:]]]*)(?:\s*([~|^$*]?=)\s*(?:(-?[_a-z\\[[:^ascii:]]][_a-z0-9\-\\[[:^ascii:]]]*)|((?&gt;(['"])(?:[^\\]|\\.)*?(\6)))))?\s*(\])</string>
-					<key>name</key>
-					<string>meta.attribute-selector.css</string>
-				</dict>
-			</array>
-		</dict>
-		<key>string-double</key>
-		<dict>
-			<key>begin</key>
-			<string>"</string>
-			<key>beginCaptures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.begin.css</string>
-				</dict>
-			</dict>
-			<key>end</key>
-			<string>"</string>
-			<key>endCaptures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.end.css</string>
-				</dict>
-			</dict>
-			<key>name</key>
-			<string>string.quoted.double.css</string>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>match</key>
-					<string>\\.</string>
-					<key>name</key>
-					<string>constant.character.escape.css</string>
-				</dict>
-			</array>
-		</dict>
-		<key>string-single</key>
-		<dict>
-			<key>begin</key>
-			<string>'</string>
-			<key>beginCaptures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.begin.css</string>
-				</dict>
-			</dict>
-			<key>end</key>
-			<string>'</string>
-			<key>endCaptures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.end.css</string>
-				</dict>
-			</dict>
-			<key>name</key>
-			<string>string.quoted.single.css</string>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>match</key>
-					<string>\\.</string>
-					<key>name</key>
-					<string>constant.character.escape.css</string>
-				</dict>
-			</array>
-		</dict>
-	</dict>
-	<key>scopeName</key>
-	<string>source.css</string>
-	<key>uuid</key>
-	<string>69AA0917-B7BB-11D9-A7E2-000D93C8BE28</string>
-</dict>
-</plist>
diff --git a/bundles/css.tmbundle/Tests/tests.css b/bundles/css.tmbundle/Tests/tests.css
deleted file mode 100644
index efb028f3f..000000000
--- a/bundles/css.tmbundle/Tests/tests.css
+++ /dev/null
@@ -1,255 +0,0 @@
-@charset 'UTF-8';
-@charset "utf-8";
-
-/* HTML+HTML5 elements */
-html, body, div, span, object, iframe,
-h1, h2, h3, h4, h5, h6, p, blockquote, pre,
-abbr, address, cite, code,
-del, dfn, em, img, ins, kbd, q, samp,
-small, strong, sub, sup, var,
-b, i,
-dl, dt, dd, ol, ul, li,
-fieldset, form, label, legend,
-table, caption, tbody, tfoot, thead, tr, th, td,
-article, aside, canvas, details, figcaption, figure, 
-footer, header, hgroup, menu, nav, section, summary,
-time, mark, audio, video {
-}
-.color-defs {
-    color: #aaa;
-    color: #abcdef;
-    color: red;
-    color: rgb(123,255,201);
-    color: rgba(123,255,201,0.5);
-    color: rgba(123,255,201,.5);
-    color: hsl(85,55%,55%);
-    color: hsla(85,55%,55%,.5);
-}
-
-#foo { color: blue; }
-.foo { color: blue }
-foo { color: blue; }
-::selection { color: blue; }
-
-div
-{
-    color: blue;
-}
-
-garbagehere
-@import url('foo.css');
-@import 'foo.css';
-@import "foo.css";
-
-garbage
-/* Test */
-
-.sizes {
-    top: -50px;
-    width: 1px;
-    width: 1pt;
-    width: 1ch;
-    width: 1cm;
-    width: 1mm;
-    width: 1in;
-    width: 1em;
-    width: 1rem;
-    width: 1ex;
-    width: 1pc;
-    width: 1deg;
-    width: 1rad;
-    width: 1grad;
-}
-unknowntag {
-    color: blue;
-}
-div {
-    pointer-events: auto none visiblePainted visibleFill visibleStroke visible painted fill stroke all inherit;
-}
-
-body {
-  counter-reset: section;           /* Set the section counter to 0 */
-}
-h1:before {
-  counter-increment: section;      /* Increment the section counter */
-  content: "Section " counter(section) ": "; /* Display the counter */
-}
-
-span:nth-child(even),
-span:nth-child(odd),
-span:nth-child(2n+1),
-span:nth-child(-2n+1),
-span:nth-child(-n+1),
-span:nth-child(1) {
-}
-
-/* These are obviously not valid rules, but they easily show all of the possible values for each
-   rule, so that we're sure we're matching them all */
-.foo {
-    font-size: xx-small x-small small medium large x-large xx-large smaller larger;
-    image-rendering: auto inherit optimizeSpeed optimizeQuality;
-    text-rendering: auto optimizeSpeed optimizeLegibility geometricPrecision inherit;
-    resize: none both horizontal vertical inherit;
-    vertical-align: sub super middle;
-    white-space: pre pre-wrap pre-line;
-    page-break-after: avoid;
-    page-break-inside: avoid !important;
-    word-wrap: break-word normal;
-    zoom: 1;
-    clip: rect(1px 1px 1px 1px);
-    color: rgba(0,0,0,.1);
-    background-color: hsl(235,25%,55%);
-    background-color: #646464;
-    background-image: -moz-linear-gradient(top, #747474 30%, #545454);
-    background-image: -webkit-gradient(linear, left top, left bottom,
-            from(#747474),
-            color-stop(30%, #747474),
-            to(#545454)
-        );
-    border-radius: 4px;
-    box-shadow: 0 0 5px #000;
-    -moz-box-shadow: 0 0 5px #000;
-    -webkit-box-shadow: 0 0 5px #000;
-    -moz-transform: rotate(30deg);
-}
-
-div:after,
-div::after,
-div:before,
-div::before,
-div:first-letter,
-div::first-letter,
-div:first-line,
-div::first-line,
-div::selection,
-a:link,
-a:visited,
-a:active,
-a:hover,
-a:focus,
-a:not(a.blah:nth-child(2n+1)),
-a:first,
-a:left,
-a:right,
-a:root,
-a:nth-last-child(-n+1),
-a:nth-of-type(5n),
-a:nth-last-of-type(1),
-a:first-child,
-a:last-child,
-a:first-of-type,
-a:last-of-type,
-a:only-of-type,
-a:empty,
-a:target,
-input:checked,
-input:enabled,
-input:default,
-input:disabled,
-input:indeterminate,
-input:invalid,
-input:optional,
-input:required,
-input:valid,
-div { }
-
-
-/* Media queries */
-@media all {
-    div {
-        font-weight: normal;
-    }
-}
-/* Test */
-@media screen {
-    div {
-        font-weight: normal;
-    }
-}
-@media (width:300px) { div { font-weight: normal; } }
-@media (min-width:300px) { div { font-weight: normal; } }
-@media (max-width:300px) { div { font-weight: normal; } }
-@media (device-width:300px) { div { font-weight: normal; } }
-@media (min-device-width:300px) { div { font-weight: normal; } }
-@media (max-device-width:300px) { div { font-weight: normal; } }
-@media (height:300px) { div { font-weight: normal; } }
-@media (min-height:300px) { div { font-weight: normal; } }
-@media (max-height:300px) { div { font-weight: normal; } }
-@media (device-height:300px) { div { font-weight: normal; } }
-@media (min-device-height:300px) { div { font-weight: normal; } }
-@media (max-device-height:300px) { div { font-weight: normal; } }
-@media (aspect-ratio:20/40) { div { font-weight: normal; } }
-@media (min-aspect-ratio:20/40) { div { font-weight: normal; } }
-@media (max-aspect-ratio:20/40) { div { font-weight: normal; } }
-@media (device-aspect-ratio:20/40) { div { font-weight: normal; } }
-@media (min-device-aspect-ratio:20/40) { div { font-weight: normal; } }
-@media (max-device-aspect-ratio:10/40) { div { font-weight: normal; } }
-@media (color) { div { font-weight: normal; } }
-@media (min-color) { div { font-weight: normal; } }
-@media (max-color) { div { font-weight: normal; } }
-@media (color-index) { div { font-weight: normal; } }
-@media (min-color-index) { div { font-weight: normal; } }
-@media (max-color-index) { div { font-weight: normal; } }
-@media (color:50) { div { font-weight: normal; } }
-@media (resolution:50dpi) { div { font-weight: normal; } }
-@media (resolution:50dpcm) { div { font-weight: normal; } }
-@media (min-resolution:50dpi) { div { font-weight: normal; } }
-@media (max-resolution:50dpi) { div { font-weight: normal; } }
-@media (monochrome) { div { font-weight: normal; } }
-@media (min-monochrome:1) { div { font-weight: normal; } }
-@media (max-monochrome:1) { div { font-weight: normal; } }
-@media (scan:interlace) { div { font-weight: normal; } }
-@media (scan:progressive) { div { font-weight: normal; } }
-@media (grid) { div { font-weight: normal; } }
-@media (orientation:portrait) { div { font-weight: normal; } }
-@media (orientation:landscape) { div { font-weight: normal; } }
-@media { div { font-weight: bold; } }
-@media all and (min-width: 500px) and (color) { div { font-weight: bold; } }
-@media (min-width: 500px) { div { font-weight: bold; } }
-@media screen and (color), projection and (color) { div { font-weight: bold; } }
-@media only screen { div { font-weight: normal; } }
-@media screen { div { font-weight: normal; } }
-@media screen, print { div { font-weight: normal; } }
-
-garbage
-
-@media all and (orientation:portrait) {
-    div {
-        font-weight: normal;
-    }
-}
-@media all and (orientation:landscape) { 
-    div {
-        font-weight: normal;
-    }
-}
-@media screen and (max-device-width: 480px) {
-    div {
-        font-weight: normal;
-    }
-}
-@media print {
-    div {
-        font-weight: normal;
-    }
-}
-@font-face {
-	font-family: 'foo';
-	src: url('foo.eot');
-	src: local('☺'),
-	    url('foo.woff') format('woff'),
-	    url('foo.ttf') format('truetype'),
-	    url('foo.svg#webfontsocnK1fE') format('svg');
-	font-weight: normal;
-	font-style: italic;
-}
-@font-face {
-	font-family: 'foo2';
-	src: url('foo2.eot');
-	src: local('☺'),
-	    url('foo2.woff') format('woff'),
-	    url('foo2.ttf') format('truetype'),
-	    url('foo2.svg#webfontsocnK1fE') format('svg');
-	font-weight: normal;
-	font-style: italic;
-}
diff --git a/bundles/css.tmbundle/info.plist b/bundles/css.tmbundle/info.plist
deleted file mode 100644
index 24181aacb..000000000
--- a/bundles/css.tmbundle/info.plist
+++ /dev/null
@@ -1,391 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>contactEmailRot13</key>
-	<string>boyvivbhf@fhogyrTenqvrag.pbz</string>
-	<key>contactName</key>
-	<string>Thomas Aylott</string>
-	<key>deleted</key>
-	<array>
-		<string>F7870105-1F57-47E5-9A1C-F8E87DFCA24F</string>
-	</array>
-	<key>description</key>
-	<string>The &lt;a href="http://www.w3.org/Style/CSS/"&gt;cascading stylesheet language&lt;/a&gt; is used in web pages. This bundle has syntax highlight, lots of snippets, validation, and more.</string>
-	<key>mainMenu</key>
-	<dict>
-		<key>excludedItems</key>
-		<array>
-			<string>0975B58C-C7A1-441E-90E4-C7C413975D42</string>
-		</array>
-		<key>items</key>
-		<array>
-			<string>50AA6E95-A754-4EBC-9C2A-68418C70D689</string>
-			<string>45E5E5A1-84CC-11D9-970D-0011242E4184</string>
-			<string>05554FE0-4A70-4F3E-81C5-72855D7EB428</string>
-			<string>------------------------------------</string>
-			<string>9F64EFE2-09C2-4F87-80D6-448A0C177E7B</string>
-			<string>59F1C716-CF05-4B66-8BBB-579964D6A5EB</string>
-			<string>D0D7941C-EE21-4445-88B2-4050CBCC2E1E</string>
-			<string>633A9FE3-2D09-45EE-AE9A-36567290F5D8</string>
-			<string>EB34703E-A048-4F3B-B65B-C4B79C5FD17B</string>
-			<string>E443AF34-F5C8-4F9E-A0CB-AD06F7544AF6</string>
-			<string>D2E0AA97-9315-4D15-BBD4-6970099B2898</string>
-			<string>DA768A1E-2E7A-4258-BB71-5CA8BDB28517</string>
-			<string>F61DB38E-02C8-42ED-8B4C-9338B8730C21</string>
-			<string>F1DB915E-493A-4F5F-9E27-E9137628BB4D</string>
-			<string>------------------------------------</string>
-			<string>5D65DB63-6397-447C-92BB-DA544933B951</string>
-			<string>22BE15A9-0DCC-4989-93AD-048C4EE4CD84</string>
-			<string>------------------------------------</string>
-			<string>435F30F3-90A8-40D8-A263-E22A1DA0BBDE</string>
-			<string>------------------------------------</string>
-			<string>64180C76-8C8D-4F29-82BE-6096BE1B14D8</string>
-			<string>3556C0BE-73B3-45CE-8C9C-7B3AA3BB038B</string>
-		</array>
-		<key>submenus</key>
-		<dict>
-			<key>22BE15A9-0DCC-4989-93AD-048C4EE4CD84</key>
-			<dict>
-				<key>items</key>
-				<array>
-					<string>749295F4-F139-422A-80A0-EA11364396E3</string>
-					<string>FCDDB549-681A-436F-894E-1A408C0E114C</string>
-					<string>81CCEB84-6241-4E4F-BB26-54BAAFA3FF2E</string>
-				</array>
-				<key>name</key>
-				<string>Proprietary</string>
-			</dict>
-			<key>435F30F3-90A8-40D8-A263-E22A1DA0BBDE</key>
-			<dict>
-				<key>items</key>
-				<array>
-					<string>E6FB4209-818E-40F5-9AFF-96E204F52A11</string>
-					<string>42E26C97-72AB-4953-807F-645AF7EDF59F</string>
-					<string>35DFB6D6-E48B-4907-9030-019904DA0C5B</string>
-				</array>
-				<key>name</key>
-				<string>CodeCompletion</string>
-			</dict>
-			<key>59F1C716-CF05-4B66-8BBB-579964D6A5EB</key>
-			<dict>
-				<key>items</key>
-				<array>
-					<string>A2EA7266-AE50-4987-A86B-E3C4DFA5B643</string>
-					<string>0FEBF51B-77B0-4D38-9CDB-276744CAF455</string>
-					<string>5FFC4EDE-9AEE-4854-BA78-34BD98BE7FBE</string>
-					<string>1998EF7F-D855-4EAF-8CE0-D76CE8C905A4</string>
-					<string>BDA03041-39C6-461C-A6F3-F6145D99AB5E</string>
-					<string>------------------------------------</string>
-					<string>979C3D46-E8B1-484D-9DBB-E3B1FCD3BCF9</string>
-					<string>EE19367C-6634-4854-910D-90C6F5752A46</string>
-					<string>8B059A97-7F2C-48CD-8422-0ECAB678E8AE</string>
-					<string>6F1126A9-5916-4E6F-8812-AB82C4638B6B</string>
-					<string>1A667AFE-208F-4697-AD44-3FA1A23AA4C7</string>
-					<string>------------------------------------</string>
-					<string>E4BD9171-E053-4EEF-8631-CFC74F1DCB97</string>
-					<string>C5039010-E264-4D3D-A12E-02C2DB7DC4BF</string>
-					<string>6AE8DB39-F8E2-4DC9-ADBA-460E952439D8</string>
-					<string>39FA441C-3A8F-49D4-BBFE-270B4C962782</string>
-					<string>8AD77320-0E31-48B9-94A9-982FD8DD1885</string>
-					<string>------------------------------------</string>
-					<string>AB0759F4-4243-4807-B297-2902459EBE02</string>
-					<string>DAF7114F-B5DC-4E70-A7CD-66FF028F93B1</string>
-					<string>321FFAF7-5699-45E6-8696-DE84AD607690</string>
-					<string>05AFB9EB-F4AB-4F86-8170-535CF508176C</string>
-					<string>189DD463-0331-4B99-8CA2-ADEEF7CC078D</string>
-				</array>
-				<key>name</key>
-				<string>Border</string>
-			</dict>
-			<key>5D65DB63-6397-447C-92BB-DA544933B951</key>
-			<dict>
-				<key>items</key>
-				<array>
-					<string>EF1F2D38-A71A-4D1D-9B07-B1CBB6D84B81</string>
-					<string>8E9366D7-BB0B-456C-B9F3-0CE8072A10C3</string>
-					<string>A723DACA-3819-4E8D-8BCF-9BD1B98AF651</string>
-					<string>39244453-6D06-4265-9894-14D7FC0B277F</string>
-					<string>D612A3B7-7C49-4447-9AAF-CCCFDE4408FF</string>
-					<string>17BBB1F1-1F83-4386-97B8-23144EB2441A</string>
-					<string>5FDD30D8-7EF8-41E9-8A44-DC3C22EFD75D</string>
-					<string>E10366F8-CA83-4447-89D3-B36AFD1EAECD</string>
-					<string>6523B6C5-8741-4766-98D6-1B1DE2E6A5F3</string>
-					<string>50C748B6-C8B6-447F-A9EE-DD41CF1CD707</string>
-					<string>1398502F-D4FD-437B-9033-49E254159BDE</string>
-					<string>1B042CEF-7C82-472D-92A2-FF555BFD6927</string>
-					<string>0C94F6A6-8AFB-47BC-8448-2383CF0D6C5B</string>
-					<string>DE6D5C37-AC74-467E-9029-9844D8F4153A</string>
-					<string>A7D10908-72FE-4502-A267-42C5B03F0D66</string>
-					<string>B121F84A-CE4A-491D-BF3D-35ED51C82554</string>
-					<string>DA7DF131-7351-4F3B-B680-57159E50E6DE</string>
-					<string>2EED405C-FBAF-4AEB-9B30-ED8EB2252378</string>
-				</array>
-				<key>name</key>
-				<string>Other</string>
-			</dict>
-			<key>633A9FE3-2D09-45EE-AE9A-36567290F5D8</key>
-			<dict>
-				<key>items</key>
-				<array>
-					<string>D69E7EB0-07E2-48A3-AD32-A7C3E6CAFBBC</string>
-					<string>FBA1210B-33DB-49D0-B026-FF31DBC41FD6</string>
-					<string>45D80BAF-0B0A-4334-AFBC-3601B5903707</string>
-				</array>
-				<key>name</key>
-				<string>Color</string>
-			</dict>
-			<key>9F64EFE2-09C2-4F87-80D6-448A0C177E7B</key>
-			<dict>
-				<key>items</key>
-				<array>
-					<string>D09967B1-2215-4B10-A331-7A372281DDA6</string>
-					<string>------------------------------------</string>
-					<string>32B7B151-17CB-4DA4-AC0B-7D02BC606403</string>
-					<string>12241B4B-197C-41AF-ACC2-6B9A7AEC7039</string>
-					<string>913410E0-623A-43F0-B71F-2E8FB9D5EBC8</string>
-					<string>C71B1388-2815-4CAE-8652-CD159095AEAD</string>
-					<string>------------------------------------</string>
-					<string>978CBFF6-62D6-45B1-93F7-5644E1C6262B</string>
-					<string>7D71DF8B-492E-493D-BD94-1A4AFCCDCBBF</string>
-					<string>------------------------------------</string>
-					<string>9E194D74-B73B-4D2B-A89F-51F7468A3E97</string>
-					<string>E198D2D5-6B52-42FD-BCBC-01B0A7E5E80E</string>
-					<string>4EE66583-26BE-4DBA-BD18-8DAF593835F9</string>
-				</array>
-				<key>name</key>
-				<string>Background</string>
-			</dict>
-			<key>D0D7941C-EE21-4445-88B2-4050CBCC2E1E</key>
-			<dict>
-				<key>items</key>
-				<array>
-					<string>5EDCDB17-5DB0-459A-A61D-29984DD3A3B8</string>
-					<string>5C9011B1-B8A8-4FD3-8EA8-848AF6509ADF</string>
-				</array>
-				<key>name</key>
-				<string>Cursor</string>
-			</dict>
-			<key>D2E0AA97-9315-4D15-BBD4-6970099B2898</key>
-			<dict>
-				<key>items</key>
-				<array>
-					<string>1C7E0430-2A67-4CEF-9D68-4ED6315A8567</string>
-					<string>BDEF3B0F-6414-4B1A-8841-864702B51EC6</string>
-					<string>9B10C768-5DA7-4570-98E4-70A36261C823</string>
-					<string>------------------------------------</string>
-					<string>C5CE7E29-9EB1-4A63-8173-190D12E4E4E4</string>
-					<string>24436F96-2383-48AB-844F-AE791DEAF080</string>
-					<string>97A55488-5DD9-4347-B5F1-722F580715E4</string>
-					<string>E024086F-94B8-401F-A903-7F0CDA8E0B8A</string>
-					<string>B8E9019D-3419-4CC3-87BB-DC54098CBFD0</string>
-				</array>
-				<key>name</key>
-				<string>List Style</string>
-			</dict>
-			<key>DA768A1E-2E7A-4258-BB71-5CA8BDB28517</key>
-			<dict>
-				<key>items</key>
-				<array>
-					<string>FA3D9F50-C5F6-4193-81D2-98A3E8FFBB2F</string>
-					<string>99315B12-6A41-4D8F-8477-F38DE0EBBEF8</string>
-					<string>68A3178C-A024-48BD-ABA6-0A03A69BD82E</string>
-					<string>------------------------------------</string>
-					<string>412AA532-762F-4270-961A-54BF6014996D</string>
-					<string>1FDAB8C2-7A0D-4C0A-97FF-77AD2CC86083</string>
-					<string>6354F6AC-74E2-42CF-96B0-7EE2733B9B34</string>
-					<string>C19985FF-A12C-49B9-9BA3-EDC726E919A0</string>
-				</array>
-				<key>name</key>
-				<string>Margin</string>
-			</dict>
-			<key>E443AF34-F5C8-4F9E-A0CB-AD06F7544AF6</key>
-			<dict>
-				<key>items</key>
-				<array>
-					<string>F5EDF655-440B-4E1B-908F-4291F3A0A3A8</string>
-					<string>30C6CFA2-C00A-4F2A-8770-096A49C3F95F</string>
-					<string>------------------------------------</string>
-					<string>25388EC7-EA59-4C87-9F11-52870ADBF1AB</string>
-					<string>CD8E3F13-2B14-401D-9646-E309FB04B678</string>
-					<string>128D7494-86EA-4615-87F4-C4D45E8C04AA</string>
-					<string>B6C9A8F9-2942-4592-B73F-2833B9F648E5</string>
-					<string>F2DC92D8-43D4-4044-9D85-D96F734FF81E</string>
-				</array>
-				<key>name</key>
-				<string>Font</string>
-			</dict>
-			<key>EB34703E-A048-4F3B-B65B-C4B79C5FD17B</key>
-			<dict>
-				<key>items</key>
-				<array>
-					<string>CA506D09-9EAE-445D-AE1E-7058937304B7</string>
-					<string>2FC3C35E-88A6-4DA0-808D-3034A96E7794</string>
-					<string>56940467-7D99-4F31-83C2-1554638F552A</string>
-					<string>98BE34AD-3CB1-4FB9-98A0-5E5A4BA63286</string>
-				</array>
-				<key>name</key>
-				<string>Display</string>
-			</dict>
-			<key>F1DB915E-493A-4F5F-9E27-E9137628BB4D</key>
-			<dict>
-				<key>items</key>
-				<array>
-					<string>F6CB9433-601A-4F95-A6B9-27D76B50DEE3</string>
-					<string>B1916E73-D417-42C2-A5C1-E95428DA6C45</string>
-					<string>2CFA68DC-947B-4C43-872C-FB4DC0704D27</string>
-					<string>------------------------------------</string>
-					<string>77EF6A55-9814-492C-B8E2-EFF0FFAC272E</string>
-					<string>005905FF-544A-434C-803E-B51689332034</string>
-					<string>1A6AD6F4-E0F7-406B-B28B-06EC54660650</string>
-					<string>------------------------------------</string>
-					<string>32CD0FA8-7BE7-4D58-A28A-7388F4CF6F9A</string>
-					<string>2FF51006-7E07-4296-B89D-5ADF7B9B4232</string>
-				</array>
-				<key>name</key>
-				<string>Text</string>
-			</dict>
-			<key>F61DB38E-02C8-42ED-8B4C-9338B8730C21</key>
-			<dict>
-				<key>items</key>
-				<array>
-					<string>6E64EA4A-A10E-49B3-AC9C-D53DBF9ED14A</string>
-					<string>4602BFF3-C7F1-4CF5-93CE-125EC8ABC7C8</string>
-					<string>DD5BB93D-4F99-4A41-8864-85A557B922C7</string>
-					<string>------------------------------------</string>
-					<string>E5B92C27-8602-4E50-9DF7-DE476E63BA1A</string>
-					<string>C1667E5D-3A50-42F8-8129-6C3EEB43D7C2</string>
-					<string>1644E167-7A29-46A7-A100-7BD6C7EFA2F3</string>
-					<string>772DD28C-80C2-4C9B-8023-1E71A974E1C4</string>
-				</array>
-				<key>name</key>
-				<string>Padding</string>
-			</dict>
-		</dict>
-	</dict>
-	<key>name</key>
-	<string>CSS</string>
-	<key>ordering</key>
-	<array>
-		<string>05554FE0-4A70-4F3E-81C5-72855D7EB428</string>
-		<string>50AA6E95-A754-4EBC-9C2A-68418C70D689</string>
-		<string>CC30D708-6E49-11D9-B411-000D93589AF6</string>
-		<string>45E5E5A1-84CC-11D9-970D-0011242E4184</string>
-		<string>0975B58C-C7A1-441E-90E4-C7C413975D42</string>
-		<string>D09967B1-2215-4B10-A331-7A372281DDA6</string>
-		<string>32B7B151-17CB-4DA4-AC0B-7D02BC606403</string>
-		<string>12241B4B-197C-41AF-ACC2-6B9A7AEC7039</string>
-		<string>913410E0-623A-43F0-B71F-2E8FB9D5EBC8</string>
-		<string>C71B1388-2815-4CAE-8652-CD159095AEAD</string>
-		<string>978CBFF6-62D6-45B1-93F7-5644E1C6262B</string>
-		<string>7D71DF8B-492E-493D-BD94-1A4AFCCDCBBF</string>
-		<string>9E194D74-B73B-4D2B-A89F-51F7468A3E97</string>
-		<string>E198D2D5-6B52-42FD-BCBC-01B0A7E5E80E</string>
-		<string>4EE66583-26BE-4DBA-BD18-8DAF593835F9</string>
-		<string>81CCEB84-6241-4E4F-BB26-54BAAFA3FF2E</string>
-		<string>A2EA7266-AE50-4987-A86B-E3C4DFA5B643</string>
-		<string>AB0759F4-4243-4807-B297-2902459EBE02</string>
-		<string>E4BD9171-E053-4EEF-8631-CFC74F1DCB97</string>
-		<string>979C3D46-E8B1-484D-9DBB-E3B1FCD3BCF9</string>
-		<string>1998EF7F-D855-4EAF-8CE0-D76CE8C905A4</string>
-		<string>05AFB9EB-F4AB-4F86-8170-535CF508176C</string>
-		<string>39FA441C-3A8F-49D4-BBFE-270B4C962782</string>
-		<string>6F1126A9-5916-4E6F-8812-AB82C4638B6B</string>
-		<string>0FEBF51B-77B0-4D38-9CDB-276744CAF455</string>
-		<string>DAF7114F-B5DC-4E70-A7CD-66FF028F93B1</string>
-		<string>C5039010-E264-4D3D-A12E-02C2DB7DC4BF</string>
-		<string>EE19367C-6634-4854-910D-90C6F5752A46</string>
-		<string>5FFC4EDE-9AEE-4854-BA78-34BD98BE7FBE</string>
-		<string>321FFAF7-5699-45E6-8696-DE84AD607690</string>
-		<string>6AE8DB39-F8E2-4DC9-ADBA-460E952439D8</string>
-		<string>8B059A97-7F2C-48CD-8422-0ECAB678E8AE</string>
-		<string>BDA03041-39C6-461C-A6F3-F6145D99AB5E</string>
-		<string>189DD463-0331-4B99-8CA2-ADEEF7CC078D</string>
-		<string>8AD77320-0E31-48B9-94A9-982FD8DD1885</string>
-		<string>1A667AFE-208F-4697-AD44-3FA1A23AA4C7</string>
-		<string>8E9366D7-BB0B-456C-B9F3-0CE8072A10C3</string>
-		<string>5EDCDB17-5DB0-459A-A61D-29984DD3A3B8</string>
-		<string>5C9011B1-B8A8-4FD3-8EA8-848AF6509ADF</string>
-		<string>D69E7EB0-07E2-48A3-AD32-A7C3E6CAFBBC</string>
-		<string>FBA1210B-33DB-49D0-B026-FF31DBC41FD6</string>
-		<string>45D80BAF-0B0A-4334-AFBC-3601B5903707</string>
-		<string>A723DACA-3819-4E8D-8BCF-9BD1B98AF651</string>
-		<string>CA506D09-9EAE-445D-AE1E-7058937304B7</string>
-		<string>2FC3C35E-88A6-4DA0-808D-3034A96E7794</string>
-		<string>56940467-7D99-4F31-83C2-1554638F552A</string>
-		<string>98BE34AD-3CB1-4FB9-98A0-5E5A4BA63286</string>
-		<string>39244453-6D06-4265-9894-14D7FC0B277F</string>
-		<string>F5EDF655-440B-4E1B-908F-4291F3A0A3A8</string>
-		<string>30C6CFA2-C00A-4F2A-8770-096A49C3F95F</string>
-		<string>25388EC7-EA59-4C87-9F11-52870ADBF1AB</string>
-		<string>CD8E3F13-2B14-401D-9646-E309FB04B678</string>
-		<string>128D7494-86EA-4615-87F4-C4D45E8C04AA</string>
-		<string>B6C9A8F9-2942-4592-B73F-2833B9F648E5</string>
-		<string>F2DC92D8-43D4-4044-9D85-D96F734FF81E</string>
-		<string>D612A3B7-7C49-4447-9AAF-CCCFDE4408FF</string>
-		<string>17BBB1F1-1F83-4386-97B8-23144EB2441A</string>
-		<string>1C7E0430-2A67-4CEF-9D68-4ED6315A8567</string>
-		<string>BDEF3B0F-6414-4B1A-8841-864702B51EC6</string>
-		<string>9B10C768-5DA7-4570-98E4-70A36261C823</string>
-		<string>C5CE7E29-9EB1-4A63-8173-190D12E4E4E4</string>
-		<string>24436F96-2383-48AB-844F-AE791DEAF080</string>
-		<string>97A55488-5DD9-4347-B5F1-722F580715E4</string>
-		<string>E024086F-94B8-401F-A903-7F0CDA8E0B8A</string>
-		<string>B8E9019D-3419-4CC3-87BB-DC54098CBFD0</string>
-		<string>68A3178C-A024-48BD-ABA6-0A03A69BD82E</string>
-		<string>FA3D9F50-C5F6-4193-81D2-98A3E8FFBB2F</string>
-		<string>99315B12-6A41-4D8F-8477-F38DE0EBBEF8</string>
-		<string>6354F6AC-74E2-42CF-96B0-7EE2733B9B34</string>
-		<string>C19985FF-A12C-49B9-9BA3-EDC726E919A0</string>
-		<string>1FDAB8C2-7A0D-4C0A-97FF-77AD2CC86083</string>
-		<string>412AA532-762F-4270-961A-54BF6014996D</string>
-		<string>5FDD30D8-7EF8-41E9-8A44-DC3C22EFD75D</string>
-		<string>E10366F8-CA83-4447-89D3-B36AFD1EAECD</string>
-		<string>6523B6C5-8741-4766-98D6-1B1DE2E6A5F3</string>
-		<string>50C748B6-C8B6-447F-A9EE-DD41CF1CD707</string>
-		<string>DD5BB93D-4F99-4A41-8864-85A557B922C7</string>
-		<string>6E64EA4A-A10E-49B3-AC9C-D53DBF9ED14A</string>
-		<string>4602BFF3-C7F1-4CF5-93CE-125EC8ABC7C8</string>
-		<string>1644E167-7A29-46A7-A100-7BD6C7EFA2F3</string>
-		<string>772DD28C-80C2-4C9B-8023-1E71A974E1C4</string>
-		<string>C1667E5D-3A50-42F8-8129-6C3EEB43D7C2</string>
-		<string>E5B92C27-8602-4E50-9DF7-DE476E63BA1A</string>
-		<string>1398502F-D4FD-437B-9033-49E254159BDE</string>
-		<string>F6CB9433-601A-4F95-A6B9-27D76B50DEE3</string>
-		<string>B1916E73-D417-42C2-A5C1-E95428DA6C45</string>
-		<string>2CFA68DC-947B-4C43-872C-FB4DC0704D27</string>
-		<string>77EF6A55-9814-492C-B8E2-EFF0FFAC272E</string>
-		<string>005905FF-544A-434C-803E-B51689332034</string>
-		<string>1A6AD6F4-E0F7-406B-B28B-06EC54660650</string>
-		<string>32CD0FA8-7BE7-4D58-A28A-7388F4CF6F9A</string>
-		<string>2FF51006-7E07-4296-B89D-5ADF7B9B4232</string>
-		<string>0C94F6A6-8AFB-47BC-8448-2383CF0D6C5B</string>
-		<string>DE6D5C37-AC74-467E-9029-9844D8F4153A</string>
-		<string>A7D10908-72FE-4502-A267-42C5B03F0D66</string>
-		<string>B121F84A-CE4A-491D-BF3D-35ED51C82554</string>
-		<string>DA7DF131-7351-4F3B-B680-57159E50E6DE</string>
-		<string>2EED405C-FBAF-4AEB-9B30-ED8EB2252378</string>
-		<string>EF1F2D38-A71A-4D1D-9B07-B1CBB6D84B81</string>
-		<string>749295F4-F139-422A-80A0-EA11364396E3</string>
-		<string>69AA0917-B7BB-11D9-A7E2-000D93C8BE28</string>
-		<string>375CF370-8A7B-450A-895C-FD18B47957E2</string>
-		<string>623154CA-0EDF-4365-9441-80D396C11979</string>
-		<string>45707407-3307-4B4D-AE9B-78BDCFB6F920</string>
-		<string>92B0C9FE-CC81-498A-B93C-376A9C47CF2D</string>
-		<string>E6FB4209-818E-40F5-9AFF-96E204F52A11</string>
-		<string>BCAF7514-033E-45D7-9E46-07FACF84DAAD</string>
-		<string>42E26C97-72AB-4953-807F-645AF7EDF59F</string>
-		<string>1E4F54FD-1940-42E0-9D0A-0EC11D81E446</string>
-		<string>35DFB6D6-E48B-4907-9030-019904DA0C5B</string>
-		<string>17B2DD5B-D2EA-4DC5-9C7D-B09B505156C5</string>
-		<string>096894D8-6A5A-4F1D-B68C-782F0A850E52</string>
-		<string>6ED38063-8791-41BB-9F9F-F9EA378B1526</string>
-		<string>FCDDB549-681A-436F-894E-1A408C0E114C</string>
-		<string>1B042CEF-7C82-472D-92A2-FF555BFD6927</string>
-		<string>64180C76-8C8D-4F29-82BE-6096BE1B14D8</string>
-		<string>3556C0BE-73B3-45CE-8C9C-7B3AA3BB038B</string>
-	</array>
-	<key>uuid</key>
-	<string>4675F24E-6227-11D9-BFB1-000D93589AF6</string>
-</dict>
-</plist>
diff --git a/bundles/html.tmbundle/Commands/About Persistent Includes.tmCommand b/bundles/html.tmbundle/Commands/About Persistent Includes.tmCommand
deleted file mode 100644
index ecca90f5d..000000000
--- a/bundles/html.tmbundle/Commands/About Persistent Includes.tmCommand	
+++ /dev/null
@@ -1,145 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>command</key>
-	<string>. "$TM_SUPPORT_PATH/lib/webpreview.sh"
-html_header "About Persistent Includes" "HTML"
-Markdown.pl &lt;&lt;'EOF'|SmartyPants.pl
-The "Add Persistent Include" command allows you to embed an external file inside your HTML document. This inclusion is handled by TextMate itself. Once you've added the include statement, use the "Update Document" command to refresh any included files.
-
-Including Files
----------------
-
-An inclusion is done using a special HTML comment:
-
-    &lt;!-- #tminclude "footer.html" --&gt;
-    &lt;!-- end tminclude --&gt;
-
-Once you've updated the document, the contents are pulled inside the inclusion markup:
-
-    &lt;!-- #tminclude "footer.html" --&gt;
-    &lt;div class="footer"&gt;Copyright (c) 2006, WebDesignCorp.&lt;/div&gt;
-    &lt;!-- end tminclude --&gt;
-
-Note: Included documents are also processed for additional inclusions and placeholders.
-
-Include Parameters
-------------------
-
-You can optionally specify parameters for the included file. Parameters are provided following the filename.
-
-    &lt;!-- #tminclude "header.html" #title#="Home Page" --&gt;
-    &lt;!-- end tminclude --&gt;
-
-With a header.html file that looks like this:
-
-	&lt;h1 class="header"&gt;#title#&lt;/h1&gt;
-
-Producing:
-
-    &lt;!-- #tminclude "header.html" #title#="Home Page" --&gt;
-	&lt;h1 class="header"&gt;Home Page&lt;/h1&gt;
-    &lt;!-- end tminclude --&gt;
-
-Placeholders
-------------
-
-The update command also processes document "placeholders". Placeholders are written in this format:
-
-	#variable#
-
-The following placeholders are available:
-
-&lt;table class="pro_table" border="0" width="100%" cellpadding="5" cellspacing="0"&gt;
-&lt;tr&gt;&lt;th&gt;Placeholder&lt;/th&gt;&lt;th&gt;Example Result&lt;/th&gt;&lt;/tr&gt;
-&lt;tr&gt;&lt;td&gt;&lt;tt&gt;#abbrevdate#    &lt;/tt&gt;&lt;/td&gt;&lt;td&gt;Abbreviated date: Sun, Aug 15, 2006&lt;/td&gt;&lt;/tr&gt;
-&lt;tr&gt;&lt;td&gt;&lt;tt&gt;#basename#      &lt;/tt&gt;&lt;/td&gt;&lt;td&gt;Filename without extension.&lt;/td&gt;&lt;/tr&gt;
-&lt;tr&gt;&lt;td&gt;&lt;tt&gt;#compdate#      &lt;/tt&gt;&lt;/td&gt;&lt;td&gt;Compact date: 15-Aug-06&lt;/td&gt;&lt;/tr&gt;
-&lt;tr&gt;&lt;td&gt;&lt;tt&gt;#creationdate#  &lt;/tt&gt;&lt;/td&gt;&lt;td&gt;Creation date: 15-Aug-06&lt;/td&gt;&lt;/tr&gt;
-&lt;tr&gt;&lt;td&gt;&lt;tt&gt;#creationtime#  &lt;/tt&gt;&lt;/td&gt;&lt;td&gt;Creation time:  1:20 PM&lt;/td&gt;&lt;/tr&gt;
-&lt;tr&gt;&lt;td&gt;&lt;tt&gt;#docsize#       &lt;/tt&gt;&lt;/td&gt;&lt;td&gt;Resulting document length in bytes&lt;/td&gt;&lt;/tr&gt;
-&lt;tr&gt;&lt;td&gt;&lt;tt&gt;#dont_update#   &lt;/tt&gt;&lt;/td&gt;&lt;td&gt;Special: presence will prevent document updating&lt;/td&gt;&lt;/tr&gt;
-&lt;tr&gt;&lt;td&gt;&lt;tt&gt;#filename#      &lt;/tt&gt;&lt;/td&gt;&lt;td&gt;Document filename&lt;/td&gt;&lt;/tr&gt;
-&lt;tr&gt;&lt;td&gt;&lt;tt&gt;#file_extension#&lt;/tt&gt;&lt;/td&gt;&lt;td&gt;Document file extension&lt;/td&gt;&lt;/tr&gt;
-&lt;tr&gt;&lt;td&gt;&lt;tt&gt;#generator#     &lt;/tt&gt;&lt;/td&gt;&lt;td&gt;TextMate&lt;/td&gt;&lt;/tr&gt;
-&lt;tr&gt;&lt;td&gt;&lt;tt&gt;#gmtime#        &lt;/tt&gt;&lt;/td&gt;&lt;td&gt;GMT time&lt;/td&gt;&lt;/tr&gt;
-&lt;tr&gt;&lt;td&gt;&lt;tt&gt;#localpath#     &lt;/tt&gt;&lt;/td&gt;&lt;td&gt;Full path to current file&lt;/td&gt;&lt;/tr&gt;
-&lt;tr&gt;&lt;td&gt;&lt;tt&gt;#localtime#     &lt;/tt&gt;&lt;/td&gt;&lt;td&gt;Local computer time&lt;/td&gt;&lt;/tr&gt;
-&lt;tr&gt;&lt;td&gt;&lt;tt&gt;#longdate#      &lt;/tt&gt;&lt;/td&gt;&lt;td&gt;Long Date: Tuesday, August 15, 2006&lt;/td&gt;&lt;/tr&gt;
-&lt;tr&gt;&lt;td&gt;&lt;tt&gt;#modifieddate#  &lt;/tt&gt;&lt;/td&gt;&lt;td&gt;Modified date: 15-Aug-06&lt;/td&gt;&lt;/tr&gt;
-&lt;tr&gt;&lt;td&gt;&lt;tt&gt;#modifiedtime#  &lt;/tt&gt;&lt;/td&gt;&lt;td&gt;Modified time:  1:20 PM&lt;/td&gt;&lt;/tr&gt;
-&lt;tr&gt;&lt;td&gt;&lt;tt&gt;#monthdaynum#   &lt;/tt&gt;&lt;/td&gt;&lt;td&gt;Day of Month: 15&lt;/td&gt;&lt;/tr&gt;
-&lt;tr&gt;&lt;td&gt;&lt;tt&gt;#monthnum#      &lt;/tt&gt;&lt;/td&gt;&lt;td&gt;Month Number: 08&lt;/td&gt;&lt;/tr&gt;
-&lt;tr&gt;&lt;td&gt;&lt;tt&gt;#shortdate#     &lt;/tt&gt;&lt;/td&gt;&lt;td&gt;Short Date: 08/15/06&lt;/td&gt;&lt;/tr&gt;
-&lt;tr&gt;&lt;td&gt;&lt;tt&gt;#shortusername# &lt;/tt&gt;&lt;/td&gt;&lt;td&gt;Login name of current user&lt;/td&gt;&lt;/tr&gt;
-&lt;tr&gt;&lt;td&gt;&lt;tt&gt;#username#      &lt;/tt&gt;&lt;/td&gt;&lt;td&gt;Name of current user&lt;/td&gt;&lt;/tr&gt;
-&lt;tr&gt;&lt;td&gt;&lt;tt&gt;#yearnum#       &lt;/tt&gt;&lt;/td&gt;&lt;td&gt;Current Year: 2006&lt;/td&gt;&lt;/tr&gt;
-&lt;/table&gt;
-
-In addition to these, all of the TextMate environment variables (those starting with a "TM_" prefix) are available as placeholders. For example:
-
-    #organization_name#
-
-Will populate using the `TM_ORGANIZATION_NAME` environment variable.
-
-Formatting Time
----------------
-
-The date-based placeholders may also specify a format that can be used to customize the date output. For example:
-
-    #gmtime %b %e, %Y# (Aug 15, 2006)
-
-Placeholder Example
--------------------
-
-If you want to make that footer.html include more useful, you can use placeholders. For example:
-
-    &lt;div class="footer"&gt;Copyright (c) #yearnum#, #oragnization_name#.&lt;/div&gt;
-
-This would then produce the following, when included and processed:
-
-    &lt;!-- #tminclude "footer.html" --&gt;
-    &lt;div class="footer"&gt;Copyright (c) 2006, WebDesignCorp.&lt;/div&gt;
-    &lt;!-- end tminclude --&gt;
-
-Scripted Includes
------------------
-
-It is also possible to produce included content using scripts. If the included file is a script, it is run and the output is placed inside the include block.
-
-	&lt;!-- #tminclude "scripts/header.pl" #class#="huge" --&gt;
-	&lt;!-- end tminclude --&gt;
-
-.pl (Perl), .py (Python) and .rb (Ruby) scripts are currently recognized. For the above example, the "header.pl" script is run with the following parameters:
-
-	header.pl (source_filename) class huge
-
-The Perl script in this case can process the parameters like this.
-
-	#!/usr/bin/perl
-	my ($filename, %args) = @ARGV;
-	print "&lt;h1 class='$args{class}'&gt;Header for $filename&lt;/h1&gt;"
-
-That would end up producing this:
-
-	&lt;!-- #tminclude "scripts/header.pl" #class#="huge" --&gt;
-	&lt;h1 class='huge'&gt;Header for /path/to/example.html&lt;/h1&gt;
-	&lt;!-- end tminclude --&gt;
-
-EOF
-html_footer</string>
-	<key>input</key>
-	<string>none</string>
-	<key>name</key>
-	<string>Help: Persistent Includes</string>
-	<key>output</key>
-	<string>showAsHTML</string>
-	<key>scope</key>
-	<string>text.html</string>
-	<key>uuid</key>
-	<string>9AFDEB2C-D9F0-423E-8211-EBB089F51F0C</string>
-</dict>
-</plist>
diff --git a/bundles/html.tmbundle/Commands/CodeCompletion HTML Attributes.tmCommand b/bundles/html.tmbundle/Commands/CodeCompletion HTML Attributes.tmCommand
deleted file mode 100644
index 45817889c..000000000
--- a/bundles/html.tmbundle/Commands/CodeCompletion HTML Attributes.tmCommand	
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>bundleUUID</key>
-	<string>467B298F-6227-11D9-BFB1-000D93589AF6</string>
-	<key>command</key>
-	<string>#!/usr/bin/env ruby
-require "#{ENV['TM_SUPPORT_PATH']}/lib/codecompletion"
-TextmateCodeCompletion.go!</string>
-	<key>fallbackInput</key>
-	<string>line</string>
-	<key>input</key>
-	<string>selection</string>
-	<key>keyEquivalent</key>
-	<string>~</string>
-	<key>name</key>
-	<string>CodeCompletion HTML Attributes</string>
-	<key>output</key>
-	<string>insertAsSnippet</string>
-	<key>scope</key>
-	<string>text.html punctuation.definition.tag -source, text.html meta.tag -entity.other.attribute-name -source</string>
-	<key>uuid</key>
-	<string>CBD82CF3-74E9-4E7A-B3F6-9348754EB5AA</string>
-</dict>
-</plist>
diff --git a/bundles/html.tmbundle/Commands/CodeCompletion HTML Tags.tmCommand b/bundles/html.tmbundle/Commands/CodeCompletion HTML Tags.tmCommand
deleted file mode 100644
index a76854224..000000000
--- a/bundles/html.tmbundle/Commands/CodeCompletion HTML Tags.tmCommand	
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>bundleUUID</key>
-	<string>467B298F-6227-11D9-BFB1-000D93589AF6</string>
-	<key>command</key>
-	<string>#!/usr/bin/env ruby
-require "#{ENV['TM_SUPPORT_PATH']}/lib/codecompletion"
-TextmateCodeCompletion.go!
-</string>
-	<key>fallbackInput</key>
-	<string>line</string>
-	<key>input</key>
-	<string>selection</string>
-	<key>keyEquivalent</key>
-	<string>~</string>
-	<key>name</key>
-	<string>CodeCompletion HTML Tags</string>
-	<key>output</key>
-	<string>insertAsSnippet</string>
-	<key>scope</key>
-	<string>text.html -entity.other.attribute-name -string.quoted, invalid.illegal.incomplete.html</string>
-	<key>uuid</key>
-	<string>3463E85F-F500-49A0-8631-D78ED85F9D60</string>
-</dict>
-</plist>
diff --git a/bundles/html.tmbundle/Commands/Convert Line : Selection to URL Escapes.plist b/bundles/html.tmbundle/Commands/Convert Line : Selection to URL Escapes.plist
deleted file mode 100644
index b88f60974..000000000
--- a/bundles/html.tmbundle/Commands/Convert Line : Selection to URL Escapes.plist	
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>command</key>
-	<string>#!/usr/bin/env ruby
-
-print STDIN.read.gsub(/([^a-zA-Z0-9_.-]+)/n) {
-  '%' + $1.unpack('H2' * $1.size).join('%').upcase
-}
-</string>
-	<key>fallbackInput</key>
-	<string>line</string>
-	<key>input</key>
-	<string>selection</string>
-	<key>keyEquivalent</key>
-	<string>@&amp;</string>
-	<key>name</key>
-	<string>URL Escape Line / Selection</string>
-	<key>output</key>
-	<string>replaceSelectedText</string>
-	<key>scope</key>
-	<string>text.html</string>
-	<key>uuid</key>
-	<string>6B024865-6095-4CE3-8EDD-DC6F2230C2FF</string>
-</dict>
-</plist>
diff --git a/bundles/html.tmbundle/Commands/Convert to HTML Entities.plist b/bundles/html.tmbundle/Commands/Convert to HTML Entities.plist
deleted file mode 100644
index 0bb8821c2..000000000
--- a/bundles/html.tmbundle/Commands/Convert to HTML Entities.plist	
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>command</key>
-	<string>#!/usr/bin/env ruby
-$KCODE = 'U'
-
-$char_to_entity = { }
-File.open("#{ENV['TM_BUNDLE_SUPPORT']}/entities.txt").read.scan(/^(\d+)\t(.+)$/) do |key, value|
-  $char_to_entity[[key.to_i].pack('U')] = value
-end
-
-def encode (text)
-  text.gsub(/[^\x00-\x7F]|["'&lt;&gt;&amp;]/) do |ch|
-    ent = $char_to_entity[ch]
-    ent ? "&amp;#{ent};" : sprintf("&amp;#x%02X;", ch.unpack("U")[0])
-  end
-end
-
-print encode(STDIN.read)
-</string>
-	<key>fallbackInput</key>
-	<string>character</string>
-	<key>input</key>
-	<string>selection</string>
-	<key>keyEquivalent</key>
-	<string>@&amp;</string>
-	<key>name</key>
-	<string>Convert Character / Selection to Entities</string>
-	<key>output</key>
-	<string>replaceSelectedText</string>
-	<key>scope</key>
-	<string>text.html</string>
-	<key>uuid</key>
-	<string>3DD8406C-A116-11D9-A5A2-000D93C8BE28</string>
-</dict>
-</plist>
diff --git a/bundles/html.tmbundle/Commands/Convert to named entities excl tags.plist b/bundles/html.tmbundle/Commands/Convert to named entities excl tags.plist
deleted file mode 100644
index e6eb0d022..000000000
--- a/bundles/html.tmbundle/Commands/Convert to named entities excl tags.plist	
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>command</key>
-	<string>#!/usr/bin/env ruby
-$KCODE = 'U'
-
-$char_to_entity = { }
-File.open("#{ENV['TM_BUNDLE_SUPPORT']}/entities.txt").read.scan(/^(\d+)\t(.+)$/) do |key, value|
-  $char_to_entity[[key.to_i].pack('U')] = value
-end
-
-def encode (text)
-  text.gsub(/[^\x00-\x7F]|["'&lt;&gt;&amp;]/) do |ch|
-    ent = $char_to_entity[ch]
-    ent ? "&amp;#{ent};" : sprintf("&amp;#x%02X;", ch.unpack("U")[0])
-  end
-end
-
-STDIN.read.scan(/(?x)
-
-    ( &lt;\?(?:[^?]*|\?(?!&gt;))*\?&gt;
-    | &lt;!-- (?m:.*?) --&gt;
-    | &lt;\/? (?i: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)\b
-        (?:[^&gt;"']|"[^"]*"|'[^']*')*
-      &gt;
-    | &amp;(?:[a-zA-Z0-9]+|\#[0-9]+|\#x[0-9a-fA-F]+);
-    )
-    |([^&lt;&amp;]+|[&lt;&amp;])
-
-  /x) do |tag, text|
-  print tag.to_s, encode(text.to_s)
-end
-</string>
-	<key>fallbackInput</key>
-	<string>character</string>
-	<key>input</key>
-	<string>selection</string>
-	<key>keyEquivalent</key>
-	<string>@&amp;</string>
-	<key>name</key>
-	<string>Convert Character / Selection to Entities Excl. Tags</string>
-	<key>output</key>
-	<string>replaceSelectedText</string>
-	<key>scope</key>
-	<string>text.html</string>
-	<key>uuid</key>
-	<string>43C9E8AE-3E53-4B82-A1AF-56697BB3EF09</string>
-</dict>
-</plist>
diff --git a/bundles/html.tmbundle/Commands/Decode HTML Entities.plist b/bundles/html.tmbundle/Commands/Decode HTML Entities.plist
deleted file mode 100644
index ca67f17cd..000000000
--- a/bundles/html.tmbundle/Commands/Decode HTML Entities.plist	
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>command</key>
-	<string>#!/usr/bin/env ruby
-$KCODE = 'U'
-
-$entity_to_char = { }
-File.open("#{ENV['TM_BUNDLE_SUPPORT']}/entities.txt").read.scan(/^(\d+)\t(.+)$/) do |key, value|
-  $entity_to_char[value] = [key.to_i].pack('U')
-end
-
-res = STDIN.read.gsub(/&amp;(?:([a-z0-9]+)|#([0-9]+)|#x([0-9A-F]+));/i) do |m|
-  if $1 then
-    $entity_to_char[$1] || m
-  else
-    [$2 ? $2.to_i : $3.hex].pack("U")
-  end
-end
-
-print res
-</string>
-	<key>fallbackInput</key>
-	<string>line</string>
-	<key>input</key>
-	<string>selection</string>
-	<key>keyEquivalent</key>
-	<string>@&amp;</string>
-	<key>name</key>
-	<string>Decode Entities in Line / Selection</string>
-	<key>output</key>
-	<string>replaceSelectedText</string>
-	<key>scope</key>
-	<string>text.html</string>
-	<key>uuid</key>
-	<string>C183920D-A126-11D9-A5A2-000D93C8BE28</string>
-</dict>
-</plist>
diff --git a/bundles/html.tmbundle/Commands/Decode Numeric URL Escapes in Line : Selection.plist b/bundles/html.tmbundle/Commands/Decode Numeric URL Escapes in Line : Selection.plist
deleted file mode 100644
index 35013b102..000000000
--- a/bundles/html.tmbundle/Commands/Decode Numeric URL Escapes in Line : Selection.plist	
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>command</key>
-	<string>#!/usr/bin/env ruby
-require 'cgi'
-print CGI.unescape(STDIN.read)
-</string>
-	<key>fallbackInput</key>
-	<string>line</string>
-	<key>input</key>
-	<string>selection</string>
-	<key>keyEquivalent</key>
-	<string>@&amp;</string>
-	<key>name</key>
-	<string>URL Unescape Line / Selection</string>
-	<key>output</key>
-	<string>replaceSelectedText</string>
-	<key>scope</key>
-	<string>text.html</string>
-	<key>uuid</key>
-	<string>2C4C9673-B166-432A-8938-75A5CA622481</string>
-</dict>
-</plist>
diff --git a/bundles/html.tmbundle/Commands/Documentation for Tag.plist b/bundles/html.tmbundle/Commands/Documentation for Tag.plist
deleted file mode 100644
index 22265e633..000000000
--- a/bundles/html.tmbundle/Commands/Documentation for Tag.plist	
+++ /dev/null
@@ -1,153 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>command</key>
-	<string>#!/usr/bin/env ruby
-#
-# Lookup current word as a tag name on w3c.org
-#
-# The mapping below was generated using:
-# ruby -e 'STDOUT &lt;&lt; "$tags = {\n" &lt;&lt; `curl -s http://www.w3.org/TR/html4/index/elements.html`.scan(%r{&lt;td title="Name"&gt;&lt;a href="(.*?)"&gt;\n?(.*?)&lt;/a&gt;&lt;/td&gt;}).map { |e| "  \"#{e[1]}\"".ljust(14) + " =&gt; \"#{e[0]}\"" }.join(",\n") &lt;&lt; "\n}\n"'
-
-$tags = {
-  "A"          =&gt; "../struct/links.html#edef-A",
-  "ABBR"       =&gt; "../struct/text.html#edef-ABBR",
-  "ACRONYM"    =&gt; "../struct/text.html#edef-ACRONYM",
-  "ADDRESS"    =&gt; "../struct/global.html#edef-ADDRESS",
-  "APPLET"     =&gt; "../struct/objects.html#edef-APPLET",
-  "AREA"       =&gt; "../struct/objects.html#edef-AREA",
-  "B"          =&gt; "../present/graphics.html#edef-B",
-  "BASE"       =&gt; "../struct/links.html#edef-BASE",
-  "BASEFONT"   =&gt; "../present/graphics.html#edef-BASEFONT",
-  "BDO"        =&gt; "../struct/dirlang.html#edef-BDO",
-  "BIG"        =&gt; "../present/graphics.html#edef-BIG",
-  "BLOCKQUOTE" =&gt; "../struct/text.html#edef-BLOCKQUOTE",
-  "BODY"       =&gt; "../struct/global.html#edef-BODY",
-  "BR"         =&gt; "../struct/text.html#edef-BR",
-  "BUTTON"     =&gt; "../interact/forms.html#edef-BUTTON",
-  "CAPTION"    =&gt; "../struct/tables.html#edef-CAPTION",
-  "CENTER"     =&gt; "../present/graphics.html#edef-CENTER",
-  "CITE"       =&gt; "../struct/text.html#edef-CITE",
-  "CODE"       =&gt; "../struct/text.html#edef-CODE",
-  "COL"        =&gt; "../struct/tables.html#edef-COL",
-  "COLGROUP"   =&gt; "../struct/tables.html#edef-COLGROUP",
-  "DD"         =&gt; "../struct/lists.html#edef-DD",
-  "DEL"        =&gt; "../struct/text.html#edef-del",
-  "DFN"        =&gt; "../struct/text.html#edef-DFN",
-  "DIR"        =&gt; "../struct/lists.html#edef-DIR",
-  "DIV"        =&gt; "../struct/global.html#edef-DIV",
-  "DL"         =&gt; "../struct/lists.html#edef-DL",
-  "DT"         =&gt; "../struct/lists.html#edef-DT",
-  "EM"         =&gt; "../struct/text.html#edef-EM",
-  "FIELDSET"   =&gt; "../interact/forms.html#edef-FIELDSET",
-  "FONT"       =&gt; "../present/graphics.html#edef-FONT",
-  "FORM"       =&gt; "../interact/forms.html#edef-FORM",
-  "FRAME"      =&gt; "../present/frames.html#edef-FRAME",
-  "FRAMESET"   =&gt; "../present/frames.html#edef-FRAMESET",
-  "H1"         =&gt; "../struct/global.html#edef-H1",
-  "H2"         =&gt; "../struct/global.html#edef-H2",
-  "H3"         =&gt; "../struct/global.html#edef-H3",
-  "H4"         =&gt; "../struct/global.html#edef-H4",
-  "H5"         =&gt; "../struct/global.html#edef-H5",
-  "H6"         =&gt; "../struct/global.html#edef-H6",
-  "HEAD"       =&gt; "../struct/global.html#edef-HEAD",
-  "HR"         =&gt; "../present/graphics.html#edef-HR",
-  "HTML"       =&gt; "../struct/global.html#edef-HTML",
-  "I"          =&gt; "../present/graphics.html#edef-I",
-  "IFRAME"     =&gt; "../present/frames.html#edef-IFRAME",
-  "IMG"        =&gt; "../struct/objects.html#edef-IMG",
-  "INPUT"      =&gt; "../interact/forms.html#edef-INPUT",
-  "INS"        =&gt; "../struct/text.html#edef-ins",
-  "ISINDEX"    =&gt; "../interact/forms.html#edef-ISINDEX",
-  "KBD"        =&gt; "../struct/text.html#edef-KBD",
-  "LABEL"      =&gt; "../interact/forms.html#edef-LABEL",
-  "LEGEND"     =&gt; "../interact/forms.html#edef-LEGEND",
-  "LI"         =&gt; "../struct/lists.html#edef-LI",
-  "LINK"       =&gt; "../struct/links.html#edef-LINK",
-  "MAP"        =&gt; "../struct/objects.html#edef-MAP",
-  "MENU"       =&gt; "../struct/lists.html#edef-MENU",
-  "META"       =&gt; "../struct/global.html#edef-META",
-  "NOFRAMES"   =&gt; "../present/frames.html#edef-NOFRAMES",
-  "NOSCRIPT"   =&gt; "../interact/scripts.html#edef-NOSCRIPT",
-  "OBJECT"     =&gt; "../struct/objects.html#edef-OBJECT",
-  "OL"         =&gt; "../struct/lists.html#edef-OL",
-  "OPTGROUP"   =&gt; "../interact/forms.html#edef-OPTGROUP",
-  "OPTION"     =&gt; "../interact/forms.html#edef-OPTION",
-  "P"          =&gt; "../struct/text.html#edef-P",
-  "PARAM"      =&gt; "../struct/objects.html#edef-PARAM",
-  "PRE"        =&gt; "../struct/text.html#edef-PRE",
-  "Q"          =&gt; "../struct/text.html#edef-Q",
-  "S"          =&gt; "../present/graphics.html#edef-S",
-  "SAMP"       =&gt; "../struct/text.html#edef-SAMP",
-  "SCRIPT"     =&gt; "../interact/scripts.html#edef-SCRIPT",
-  "SELECT"     =&gt; "../interact/forms.html#edef-SELECT",
-  "SMALL"      =&gt; "../present/graphics.html#edef-SMALL",
-  "SPAN"       =&gt; "../struct/global.html#edef-SPAN",
-  "STRIKE"     =&gt; "../present/graphics.html#edef-STRIKE",
-  "STRONG"     =&gt; "../struct/text.html#edef-STRONG",
-  "STYLE"      =&gt; "../present/styles.html#edef-STYLE",
-  "SUB"        =&gt; "../struct/text.html#edef-SUB",
-  "SUP"        =&gt; "../struct/text.html#edef-SUP",
-  "TABLE"      =&gt; "../struct/tables.html#edef-TABLE",
-  "TBODY"      =&gt; "../struct/tables.html#edef-TBODY",
-  "TD"         =&gt; "../struct/tables.html#edef-TD",
-  "TEXTAREA"   =&gt; "../interact/forms.html#edef-TEXTAREA",
-  "TFOOT"      =&gt; "../struct/tables.html#edef-TFOOT",
-  "TH"         =&gt; "../struct/tables.html#edef-TH",
-  "THEAD"      =&gt; "../struct/tables.html#edef-THEAD",
-  "TITLE"      =&gt; "../struct/global.html#edef-TITLE",
-  "TR"         =&gt; "../struct/tables.html#edef-TR",
-  "TT"         =&gt; "../present/graphics.html#edef-TT",
-  "U"          =&gt; "../present/graphics.html#edef-U",
-  "UL"         =&gt; "../struct/lists.html#edef-UL",
-  "VAR"        =&gt; "../struct/text.html#edef-VAR"
-}
-
-def request_tag_name (default_tag = "body")
-  res, tag = %x{ "$TM_SUPPORT_PATH/bin/CocoaDialog.app/Contents/MacOS/CocoaDialog" \
-    inputbox --float --title 'Documentation for Tag' \
-    --informative-text 'What tag would you like to lookup?' \
-    --text '#{default_tag}' --button1 'Lookup' --button2 'Cancel' \
-    --button3 'Show All Tags'
-  }.split("\n")
-  case res.to_i
-    when 1 then $tags[tag.to_s.upcase] || "elements.html"
-    when 2 then abort "&lt;script&gt;window.close()&lt;/script&gt;"
-    when 3 then "elements.html"
-  end
-end
-
-line, col = ENV["TM_CURRENT_LINE"].to_s, ENV["TM_LINE_INDEX"].to_i
-tag = line =~ /\A.{0,#{col}}&lt;\s*(\w+)/ ? $1 : ENV["TM_CURRENT_WORD"].to_s
-
-path = $tags[tag.upcase] || request_tag_name(tag)
-url  = "http://www.w3.org/TR/html4/index/" + path
-puts "&lt;meta http-equiv='Refresh' content='0;URL=#{url}'&gt;"
-</string>
-	<key>input</key>
-	<string>none</string>
-	<key>inputFormat</key>
-	<string>text</string>
-	<key>keyEquivalent</key>
-	<string>^h</string>
-	<key>name</key>
-	<string>Documentation for Tag</string>
-	<key>outputCaret</key>
-	<string>afterOutput</string>
-	<key>outputFormat</key>
-	<string>html</string>
-	<key>outputLocation</key>
-	<string>newWindow</string>
-	<key>scope</key>
-	<string>text.html, text.html entity.name.tag</string>
-	<key>semanticClass</key>
-	<string>lookup.define.html</string>
-	<key>uuid</key>
-	<string>637CEA2B-578C-429C-BB74-30E8D42BFA22</string>
-	<key>version</key>
-	<integer>2</integer>
-</dict>
-</plist>
diff --git a/bundles/html.tmbundle/Commands/Encrypt Line : Selection (ROT 13).tmCommand b/bundles/html.tmbundle/Commands/Encrypt Line : Selection (ROT 13).tmCommand
deleted file mode 100644
index 679622018..000000000
--- a/bundles/html.tmbundle/Commands/Encrypt Line : Selection (ROT 13).tmCommand	
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>command</key>
-	<string>#!/usr/bin/env ruby
-
-def e_js(str)
-  str.gsub(/(?=[\\"])/, '\\').gsub(/\n/, '\n').gsub(/[@.\/]/) { |ch| sprintf('\\%03o', ch[0]) }
-end
-
-def rot_13(str)
-  str.tr('A-Za-z', 'N-ZA-Mn-za-m')
-end
-
-print %{&lt;script type="text/javascript"&gt;document.write(
-"#{e_js(rot_13(STDIN.read))}".replace(/[a-zA-Z]/g, function(c){return String.fromCharCode((c&lt;="Z"?90:122)&gt;=(c=c.charCodeAt(0)+13)?c:c-26);}));
-&lt;/script&gt;}
-</string>
-	<key>fallbackInput</key>
-	<string>line</string>
-	<key>input</key>
-	<string>selection</string>
-	<key>keyEquivalent</key>
-	<string>@&amp;</string>
-	<key>name</key>
-	<string>Encrypt Line / Selection (ROT 13)</string>
-	<key>output</key>
-	<string>replaceSelectedText</string>
-	<key>scope</key>
-	<string>text.html</string>
-	<key>uuid</key>
-	<string>9B13543F-8356-443C-B6E7-D9259B604927</string>
-</dict>
-</plist>
diff --git a/bundles/html.tmbundle/Commands/Insert Close Tag.plist b/bundles/html.tmbundle/Commands/Insert Close Tag.plist
deleted file mode 100644
index 227623572..000000000
--- a/bundles/html.tmbundle/Commands/Insert Close Tag.plist	
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>command</key>
-	<string>#!/usr/bin/env ruby
-
-doc        = STDIN.read
-line       = ENV['TM_LINE_NUMBER'].to_i
-line_index = ENV['TM_LINE_INDEX'].to_i
-
-if ENV.has_key? 'TM_INPUT_START_LINE' then
-  line       = ENV['TM_INPUT_START_LINE'].to_i
-  line_index = ENV['TM_INPUT_START_LINE_INDEX'].to_i
-end
-
-before = /(.*\n){#{line-1}}.{#{line_index}}/.match(doc)[0]
-
-before.gsub!(/&lt;[^&gt;]+\/\s*&gt;/i, '')
-
-# remove all self-closing tags
-if ENV.has_key?('TM_HTML_EMPTY_TAGS') then
-  empty_tags = ENV['TM_HTML_EMPTY_TAGS']
-  before.gsub!(/&lt;(#{empty_tags})\b[^&gt;]*&gt;/i, '')
-end
-
-# remove all comments
-before.gsub!(/&lt;!--.*?--&gt;/m, '')
-
-stack = [ ]
-before.scan(/&lt;\s*(\/)?\s*(\w[\w:-]*)[^&gt;]*&gt;/) do |m|
-  if m[0].nil? then
-    stack &lt;&lt; m[1]
-  else
-    until stack.empty? do
-      close_tag = stack.pop
-      break if close_tag == m[1]
-    end
-  end
-end
-
-if stack.empty? then
-  %x{ osascript -e beep &amp;&gt;/dev/null &amp; }
-else
-  print "&lt;/#{stack.pop}&gt;"
-end</string>
-	<key>input</key>
-	<string>document</string>
-	<key>keyEquivalent</key>
-	<string>~@.</string>
-	<key>name</key>
-	<string>Insert Close Tag</string>
-	<key>output</key>
-	<string>afterSelectedText</string>
-	<key>uuid</key>
-	<string>0658019F-3635-462E-AAC2-74E4FE508A9B</string>
-</dict>
-</plist>
diff --git a/bundles/html.tmbundle/Commands/Insert Entity….plist b/bundles/html.tmbundle/Commands/Insert Entity….plist
deleted file mode 100644
index 4b7e8b908..000000000
--- a/bundles/html.tmbundle/Commands/Insert Entity….plist	
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>command</key>
-	<string>#!/usr/bin/env ruby -w
-SUPPORT = ENV['TM_SUPPORT_PATH']
-DIALOG = SUPPORT + '/bin/tm_dialog'
-
-require "#{SUPPORT}/lib/osx/plist"
-require "#{SUPPORT}/lib/escape"
-
-entities = [ ]
-File.read("#{ENV['TM_BUNDLE_SUPPORT']}/entities.txt").scan(/^(\d+)\t(.+)$/) do |key, value|
-  char = [key.to_i].pack('U')
-  entities &lt;&lt; { 'display' =&gt; "#{value} (#{char})", 'char' =&gt; char, 'entity' =&gt; value }
-end
-
-plist = { 'entities' =&gt; entities, 'insertAsEntity' =&gt; true }.to_plist
-open("|#{e_sh DIALOG} -cm 'Insert Entity'", 'w+') do |io|
-  io &lt;&lt; plist; io.close_write
-
-  res = OSX::PropertyList.load(io.read)['result']
-  abort if res.nil?
-
-  if res['asEntity']
-    print '&amp;' + res['returnArgument'].first['entity'] + ';'
-  else
-    print res['returnArgument'].first['char']
-  end
-end
-</string>
-	<key>input</key>
-	<string>none</string>
-	<key>keyEquivalent</key>
-	<string>@&amp;</string>
-	<key>name</key>
-	<string>Insert Entity…</string>
-	<key>output</key>
-	<string>afterSelectedText</string>
-	<key>scope</key>
-	<string>text.html</string>
-	<key>uuid</key>
-	<string>89E5CC0A-3EFF-4DEF-A299-2E9651DE6529</string>
-</dict>
-</plist>
diff --git a/bundles/html.tmbundle/Commands/Insert Tag Pair.plist b/bundles/html.tmbundle/Commands/Insert Tag Pair.plist
deleted file mode 100644
index 451f867fa..000000000
--- a/bundles/html.tmbundle/Commands/Insert Tag Pair.plist	
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>command</key>
-	<string>#!/usr/bin/env ruby -wKU
-#
-# This script will expand the current word into: &lt;word&gt;&lt;/word&gt;
-# It will recognize HTML 4.0 tags that need no close tag.
-#
-# With no current word, it will insert: &lt;p&gt;&lt;/p&gt; and allows you
-# to overwrite the tag name and add potential arguments.
-#
-# The result is inserted as a snippet, so it's
-# possible to tab through the place holders.
-
-# single tags
-single_no_arg = /^(?:br|hr)$/i
-single        = /^(?:img|meta|link|input|base|area|col|frame|param)$/i
-other_tag     = /^[\w\-:_]+$/i
-
-# we are not in HTML mode, so let’s scrap the above hardcoded tag lists
-unless ENV.has_key? 'TM_HTML_EMPTY_TAGS' then
-  single_no_arg = /(?=not)possible/
-  single        = /(?=not)possible/
-end
-
-# handle the case where caret is in the middle of a word, assume only the left part is the tag
-index = ENV['TM_LINE_INDEX'].to_i - ENV['TM_INPUT_START_LINE_INDEX'].to_i
-tag, suffix = STDIN.read, ''
-if index &lt; tag.length &amp;&amp; !ENV['TM_SELECTED_TEXT']
-  tag, suffix = tag[0...index], tag[index..-1]
-end
-
-xhtml = ENV['TM_XHTML'].to_s
-
-print case tag
-  when single_no_arg then "&lt;#{tag}#{xhtml}&gt;"
-  when single then        "&lt;#{tag} $1#{xhtml}&gt;"
-  when other_tag then     "&lt;#{tag}&gt;$1&lt;/#{tag.strip[/^\S+/]}&gt;"
-  else                    "#{tag}&lt;${1:#{ENV['TM_DEFAULT_TAG'] || 'p'}}&gt;$2&lt;/${1/\\s.*//}&gt;"
-end
-
-print suffix
-</string>
-	<key>fallbackInput</key>
-	<string>word</string>
-	<key>input</key>
-	<string>selection</string>
-	<key>keyEquivalent</key>
-	<string>^&lt;</string>
-	<key>name</key>
-	<string>Insert Open/Close Tag (With Current Word)</string>
-	<key>output</key>
-	<string>insertAsSnippet</string>
-	<key>uuid</key>
-	<string>2ED44A32-C353-447F-BAE4-E3522DB6944D</string>
-</dict>
-</plist>
diff --git a/bundles/html.tmbundle/Commands/Persistent Include.tmCommand b/bundles/html.tmbundle/Commands/Persistent Include.tmCommand
deleted file mode 100644
index bc42674ae..000000000
--- a/bundles/html.tmbundle/Commands/Persistent Include.tmCommand	
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>command</key>
-	<string>#!/usr/bin/env ruby
-require "#{ENV['TM_BUNDLE_SUPPORT']}/tminclude.rb"
-TextMate::Includes.instance.include_command
-</string>
-	<key>input</key>
-	<string>none</string>
-	<key>keyEquivalent</key>
-	<string>^@i</string>
-	<key>name</key>
-	<string>Add Persistent Include</string>
-	<key>output</key>
-	<string>afterSelectedText</string>
-	<key>scope</key>
-	<string>text.html</string>
-	<key>uuid</key>
-	<string>0D814247-7A00-46EE-A2A4-45FBBF4B1181</string>
-</dict>
-</plist>
diff --git a/bundles/html.tmbundle/Commands/Preview in All Active Browsers.plist b/bundles/html.tmbundle/Commands/Preview in All Active Browsers.plist
deleted file mode 100644
index 1839d64cf..000000000
--- a/bundles/html.tmbundle/Commands/Preview in All Active Browsers.plist	
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>saveActiveFile</string>
-	<key>command</key>
-	<string>#!/usr/bin/env ruby -wKU
-# 
-# Open Document in Running Browser(s)
-# 
-# Now supports multiple running versions of a single browser along
-# with a range of new/old browsers. Bring back support for Firefox.
-# 
-# Options: Set TM_PROJECT_SITEURL in your TM Project Window Info Button
-# in the following form: "http://example.com/"
-
-require "#{ENV['TM_SUPPORT_PATH']}/lib/escape.rb"
-
-if ENV['TM_PROJECT_SITEURL']
-  url = "#{ENV['TM_PROJECT_SITEURL']}" + ENV['TM_FILEPATH'].sub(/^#{Regexp.escape(ENV['TM_PROJECT_DIRECTORY'])}\//, '') 
-else
-  url = "file://#{ENV['TM_FILEPATH']}"
-end
-
-proclist = `ps -x -o command`
-active = []
-os = `defaults read /System/Library/CoreServices/SystemVersion ProductVersion`
-
-browsers = %w[ Safari OmniWeb Camino Shiira firefox(-bin)? Xyle\ scope Opera Internet\ Explorer flock-bin iCab Sunrise seamonkey-bin navigator-bin Google\ Chrome].join('|')
-
-# Build paths to each active browser
-#
-# Notes:
-#   - 'WebKit' look ahead is to rule it out so we can use the working
-#      rule below.
-#   - 'LaunchCFMApp' portion is so iCab works.
-active = proclist.scan(%r{^(?:/.*LaunchCFMApp )?(/.*\.app)(?=/Contents/MacOS/(?:#{browsers})\b(?!.*WebKit))})
-
-# Special check for WebKit as it appears as Safari
-# Note: Only supports one running instance of WebKit, picked at random.
-if proclist =~ %r{/Contents/MacOS/Safari.*WebKit}
-  active &lt;&lt; "WebKit"
-end
-
-# TODO: Change when Leopard Only
-# On Leopard use the -g option to open in background.
-if os =~ /^10\.(5|6|7)/
-  active.each {|p| `open -g -a #{e_sh(p)} #{e_sh(url)}` }
-else
-  active.each {|p| `open -a #{e_sh(p)} #{e_sh(url)}` }
-end</string>
-	<key>input</key>
-	<string>none</string>
-	<key>name</key>
-	<string>Open Document in Running Browser(s)</string>
-	<key>output</key>
-	<string>discard</string>
-	<key>scope</key>
-	<string>text.html</string>
-	<key>uuid</key>
-	<string>970EE6B4-A091-11D9-A5A2-000D93C8BE28</string>
-</dict>
-</plist>
diff --git a/bundles/html.tmbundle/Commands/Refresh All Active Browsers.plist b/bundles/html.tmbundle/Commands/Refresh All Active Browsers.plist
deleted file mode 100644
index 9ed929e2c..000000000
--- a/bundles/html.tmbundle/Commands/Refresh All Active Browsers.plist	
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>saveActiveFile</string>
-	<key>command</key>
-	<string>###	Refresh All Active Browsers - OmniWeb, Safari, Firefox &amp; IE
-### v1.0. 2005-03-29
-###
-
-# Check if Internet Explorer is running, if so refresh
-ps -xc|grep -sq "Internet Explorer" &amp;&amp; osascript -e 'tell app "Internet Explorer"' -e 'activate' -e 'OpenURL "JavaScript:window.location.reload();" toWindow -1' -e 'end tell'
-
-# Check if OmniWeb is running, if so refresh
-ps -xc|grep -sq OmniWeb &amp;&amp; osascript -e 'tell app "OmniWeb"' -e 'activate' -e 'reload first browser' -e 'end tell'
-
-# Check if Firefox is running, if so refresh
-ps -xc|grep -sqi firefox &amp;&amp; osascript &lt;&lt;'APPLESCRIPT'
-   tell app "Firefox" to activate
-   tell app "System Events"
-      if UI elements enabled then
-         keystroke "r" using command down
-         -- Fails if System Preferences &gt; Universal access &gt; "Enable access for assistive devices" is not on 
-      else
-         -- Comment out until Firefox regains Applescript support
-         -- tell app "Firefox" to Get URL "JavaScript:window.location.reload();" inside window 1
-         -- Fails if Firefox is set to open URLs from external apps in new tabs.
-      end if
-   end tell
-APPLESCRIPT
-
-# Check if Safari is running, if so refresh
-ps -xc|grep -sq Safari &amp;&amp; osascript -e 'tell app "Safari"' -e 'activate' -e 'do JavaScript "window.location.reload();" in first document' -e 'end tell'
-
-# Check if Camino is running, if so refresh 
-ps -xc|grep -sq Camino &amp;&amp; osascript -e 'tell app "Camino"' -e 'activate' -e 'tell app "System Events" to keystroke "r" using {command down}' -e 'end tell'
-
-# Check if Chrome is running, if so refresh 
-ps -xc|grep -sq Chrome &amp;&amp; osascript -e 'tell app "Google Chrome"' -e 'activate' -e 'tell app "System Events" to keystroke "r" using {command down}' -e 'end tell'
-</string>
-	<key>input</key>
-	<string>none</string>
-	<key>keyEquivalent</key>
-	<string>@r</string>
-	<key>name</key>
-	<string>Refresh Running Browser(s)</string>
-	<key>output</key>
-	<string>discard</string>
-	<key>scope</key>
-	<string>text.html, source.css</string>
-	<key>uuid</key>
-	<string>B8651C6E-A05E-11D9-86AC-000D93C8BE28</string>
-</dict>
-</plist>
diff --git a/bundles/html.tmbundle/Commands/Show Web Preview.tmCommand b/bundles/html.tmbundle/Commands/Show Web Preview.tmCommand
deleted file mode 100644
index c3ea594f8..000000000
--- a/bundles/html.tmbundle/Commands/Show Web Preview.tmCommand	
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>command</key>
-	<string>#!/bin/sh
-if [[ -e "$TM_FILEPATH" ]]; then
-	echo "&lt;base href=\"file://$TM_FILEPATH\"&gt;"
-fi
-cat
-</string>
-	<key>input</key>
-	<string>document</string>
-	<key>keyEquivalent</key>
-	<string>^~@p</string>
-	<key>name</key>
-	<string>Show Web Preview</string>
-	<key>output</key>
-	<string>showAsHTML</string>
-	<key>uuid</key>
-	<string>AC5F664E-86BA-4D81-B6CE-1B12F69FA490</string>
-</dict>
-</plist>
diff --git a/bundles/html.tmbundle/Commands/Strip HTML tags.plist b/bundles/html.tmbundle/Commands/Strip HTML tags.plist
deleted file mode 100644
index f291bd752..000000000
--- a/bundles/html.tmbundle/Commands/Strip HTML tags.plist	
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>command</key>
-	<string>## Strip HTML and PHP tags from the selected text
-php -r 'echo strip_tags( file_get_contents("/dev/stdin") );'
-
-###  If you want to keep a particular tag, such as &lt;p&gt; comment the above line and uncomment the next line
-# php -r 'echo strip_tags( file_get_contents("/dev/stdin"), "&lt;p&gt;" );'
-### end</string>
-	<key>fallbackInput</key>
-	<string>document</string>
-	<key>input</key>
-	<string>selection</string>
-	<key>keyEquivalent</key>
-	<string></string>
-	<key>name</key>
-	<string>Strip HTML Tags from Document / Selection</string>
-	<key>output</key>
-	<string>replaceSelectedText</string>
-	<key>scope</key>
-	<string>text.html</string>
-	<key>uuid</key>
-	<string>20D760B5-A127-11D9-A5A2-000D93C8BE28</string>
-</dict>
-</plist>
diff --git a/bundles/html.tmbundle/Commands/Tidy.plist b/bundles/html.tmbundle/Commands/Tidy.plist
deleted file mode 100644
index 1fb5028a8..000000000
--- a/bundles/html.tmbundle/Commands/Tidy.plist
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>captureFormatString</key>
-	<string>$3</string>
-	<key>capturePattern</key>
-	<string>line (\d+) column (\d+) - (.*?)$</string>
-	<key>command</key>
-	<string>#!/usr/bin/env ruby -wKU
-
-require ENV['TM_SUPPORT_PATH'] + '/lib/ui.rb'
-require ENV['TM_SUPPORT_PATH'] + '/lib/exit_codes.rb'
-
-result = `"${TM_TIDY:-tidy}" -f /tmp/tm_tidy_errors -iq -utf8 \
-          -wrap 0 --tab-size $TM_TAB_SIZE --indent-spaces $TM_TAB_SIZE \
-		--indent yes \
-          ${TM_XHTML:+-asxhtml --output-xhtml yes} \
-          ${TM_SELECTED_TEXT:+--show-body-only yes} \
-          --enclose-text yes \
-          --doctype strict \
-		--wrap-php no \
-          --tidy-mark no`
-status = $?.exitstatus
-
-at_exit { File.unlink('/tmp/tm_tidy_errors') } # Clean up error log
-
-if status == 2 # Errors
-
-  msg = "Errors: " + File.read('/tmp/tm_tidy_errors')
-  TextMate.exit_show_tool_tip msg
-
-elsif status == 1 # Warnings - use output but also display notification with warnings
-  
-  log = File.read('/tmp/tm_tidy_errors').to_a.select do |line|
-    ! (ENV['TM_SELECTED_TEXT'] and (line.include?('Warning: missing &lt;!DOCTYPE&gt; declaration') or line.include?("Warning: inserting missing 'title' element")))
-  end.join rescue nil
-  
-  unless log.empty?
-    options = {
-      :title   =&gt; "Tidy Warnings",
-      :summary =&gt; "Warnings for tidying your document (press escape to close):",
-      :log     =&gt; log
-    }
-    TextMate::UI.simple_notification(options)
-  end
-
-end
-
-if ENV['TM_SOFT_TABS'] == "YES"
-  print result
-else
-  in_pre = false
-  result.each_line do |line|
-    unless in_pre
-      tab_size = ENV["TM_TAB_SIZE"].to_i
-      space, text = /( *)(.*)/m.match(line)[1..2]
-      line = "\t" * (space.length / tab_size).floor + " "  * (space.length % tab_size) + text
-    end
-    
-    print line
-  
-    in_pre = true  if line.include?("&lt;pre&gt;")
-    in_pre = false if line.include?("&lt;/pre&gt;")
-  end
-end</string>
-	<key>input</key>
-	<string>selection</string>
-	<key>keyEquivalent</key>
-	<string>^H</string>
-	<key>lineCaptureRegister</key>
-	<string>1</string>
-	<key>name</key>
-	<string>Tidy</string>
-	<key>output</key>
-	<string>replaceSelectedText</string>
-	<key>scope</key>
-	<string>text.html</string>
-	<key>uuid</key>
-	<string>45F92B81-6F0E-11D9-A1E4-000D9332809C</string>
-</dict>
-</plist>
diff --git a/bundles/html.tmbundle/Commands/Update Includes.tmCommand b/bundles/html.tmbundle/Commands/Update Includes.tmCommand
deleted file mode 100644
index 4fbf23f61..000000000
--- a/bundles/html.tmbundle/Commands/Update Includes.tmCommand	
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>command</key>
-	<string>#!/usr/bin/env ruby
-require "#{ENV['TM_BUNDLE_SUPPORT']}/tminclude.rb"
-TextMate::Includes.instance.process_persistent_includes
-</string>
-	<key>input</key>
-	<string>document</string>
-	<key>keyEquivalent</key>
-	<string>^@u</string>
-	<key>name</key>
-	<string>Update Document</string>
-	<key>output</key>
-	<string>replaceDocument</string>
-	<key>scope</key>
-	<string>text.html</string>
-	<key>uuid</key>
-	<string>4400BCE9-20E3-426E-B1D7-2C0BCA53BCF8</string>
-</dict>
-</plist>
diff --git a/bundles/html.tmbundle/Commands/Update Project.tmCommand b/bundles/html.tmbundle/Commands/Update Project.tmCommand
deleted file mode 100644
index 9000b6008..000000000
--- a/bundles/html.tmbundle/Commands/Update Project.tmCommand	
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>command</key>
-	<string>#!/usr/bin/env ruby
-require "#{ENV['TM_BUNDLE_SUPPORT']}/tminclude.rb"
-TextMate::Includes.instance.process_persistent_includes_for_project
-</string>
-	<key>input</key>
-	<string>none</string>
-	<key>keyEquivalent</key>
-	<string>^@u</string>
-	<key>name</key>
-	<string>Update Project / Selected Files</string>
-	<key>output</key>
-	<string>showAsTooltip</string>
-	<key>scope</key>
-	<string>text.html</string>
-	<key>uuid</key>
-	<string>CA24BD98-E4B6-48F8-B15A-84CC533BE1BD</string>
-</dict>
-</plist>
diff --git a/bundles/html.tmbundle/Commands/W3C validation.plist b/bundles/html.tmbundle/Commands/W3C validation.plist
deleted file mode 100644
index 08099c67b..000000000
--- a/bundles/html.tmbundle/Commands/W3C validation.plist	
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>command</key>
-	<string>#!/usr/bin/env ruby -wKU
-STDOUT.sync = true
-
-page = STDIN.read
-page.gsub!(/&lt;\?(php|=).*?\?&gt;|&lt;%.*?%&gt;/m, '')
-
-open('|curl -sF uploaded_file=@-\;type=text/html http://validator.w3.org/check', 'r+') do |io|
-  io &lt;&lt; page; io.close_write
-
-  result = io.read
-
-  result.gsub!(/&lt;\/title&gt;/, '\&amp;&lt;base href="http://validator.w3.org/"&gt;')
-  result.gsub!(/Line (\d+),?\s*Column (\d+)/mi) do
-    "&lt;a href=\"txmt://open?line=#$1&amp;amp;column=#{$2.to_i + 1}\"&gt;#$&amp;&lt;/a&gt;"
-  end
-  puts result
-end
-</string>
-	<key>dontFollowNewOutput</key>
-	<true/>
-	<key>input</key>
-	<string>document</string>
-	<key>keyEquivalent</key>
-	<string>^V</string>
-	<key>name</key>
-	<string>Validate Syntax (W3C)</string>
-	<key>output</key>
-	<string>showAsHTML</string>
-	<key>scope</key>
-	<string>text.html</string>
-	<key>uuid</key>
-	<string>3F26240E-6E4A-11D9-B411-000D93589AF6</string>
-</dict>
-</plist>
diff --git a/bundles/html.tmbundle/Commands/Wrap Each Selected Line in Open:Close Tag.plist b/bundles/html.tmbundle/Commands/Wrap Each Selected Line in Open:Close Tag.plist
deleted file mode 100644
index e8c48568c..000000000
--- a/bundles/html.tmbundle/Commands/Wrap Each Selected Line in Open:Close Tag.plist	
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>command</key>
-	<string>perl -pe 's/[\$`\\]/\\$&amp;/g; s/([ \t]*)(.+)/$1&lt;\${1:li}&gt;$2&lt;\/\${1\/\\s.*\/\/}&gt;/'</string>
-	<key>fallbackInput</key>
-	<string>line</string>
-	<key>input</key>
-	<string>selection</string>
-	<key>keyEquivalent</key>
-	<string>^@W</string>
-	<key>name</key>
-	<string>Wrap Each Selected Line in Open/Close Tag</string>
-	<key>output</key>
-	<string>insertAsSnippet</string>
-	<key>scope</key>
-	<string>text.html</string>
-	<key>uuid</key>
-	<string>991E7EBD-F3F5-469A-BA01-DC30E04AD472</string>
-</dict>
-</plist>
diff --git a/bundles/html.tmbundle/DragCommands/Anchor Tag.plist b/bundles/html.tmbundle/DragCommands/Anchor Tag.plist
deleted file mode 100644
index cb51864d4..000000000
--- a/bundles/html.tmbundle/DragCommands/Anchor Tag.plist	
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>command</key>
-	<string>title=`echo $TM_DROPPED_FILE | perl -pe 's/^(.*\/)?(.*?)(\..*)?$/$2/g'`
-echo -n "&lt;a href=\"$TM_DROPPED_FILE\" id=\"\" title=\"\${1:$title}\"&gt;\${1:$title}&lt;/a&gt;"</string>
-	<key>draggedFileExtensions</key>
-	<array>
-		<string>html</string>
-		<string>htm</string>
-		<string>rhtml</string>
-		<string>shtml</string>
-		<string>phtml</string>
-		<string>php</string>
-		<string>php3</string>
-		<string>php4</string>
-		<string>php5</string>
-		<string>cfm</string>
-		<string>cfml</string>
-		<string>dbm</string>
-		<string>dbml</string>
-	</array>
-	<key>name</key>
-	<string>Insert Anchor</string>
-	<key>output</key>
-	<string>insertAsSnippet</string>
-	<key>scope</key>
-	<string>text.html</string>
-	<key>uuid</key>
-	<string>B23D6E15-6B33-11D9-86C1-000D93589AF6</string>
-</dict>
-</plist>
diff --git a/bundles/html.tmbundle/DragCommands/CSS Link.plist b/bundles/html.tmbundle/DragCommands/CSS Link.plist
deleted file mode 100644
index 03fade775..000000000
--- a/bundles/html.tmbundle/DragCommands/CSS Link.plist	
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>command</key>
-	<string>echo "&lt;link rel=\"stylesheet\" href=\"$TM_DROPPED_FILE\" type=\"text/css\" media=\"screen\" title=\"no title\" charset=\"utf-8\"$TM_XHTML&gt;"</string>
-	<key>draggedFileExtensions</key>
-	<array>
-		<string>css</string>
-	</array>
-	<key>name</key>
-	<string>Insert CSS Link</string>
-	<key>output</key>
-	<string>insertAsSnippet</string>
-	<key>scope</key>
-	<string>text.html</string>
-	<key>uuid</key>
-	<string>C8B717C2-6B33-11D9-BB47-000D93589AF6</string>
-</dict>
-</plist>
diff --git a/bundles/html.tmbundle/DragCommands/Image Tag.plist b/bundles/html.tmbundle/DragCommands/Image Tag.plist
deleted file mode 100644
index 0064d7dc4..000000000
--- a/bundles/html.tmbundle/DragCommands/Image Tag.plist	
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>command</key>
-	<string>#!/usr/bin/env ruby -wKU
-require "#{ENV['TM_SUPPORT_PATH']}/lib/escape"
-require "shellwords"
-require "cgi"
-
-def tag_for_file(file, tab_stop = 0)
-    file_path = File.expand_path file
-
-	tag = "&lt;img src=\"#{e_sn(CGI::escapeHTML file)}\""
-
-	dim = %x{ sips -g pixelWidth -g pixelHeight #{e_sh file_path} }
-	tag &lt;&lt; " width=\"#$1\""  if dim =~ /pixelWidth: (\d+)/
-	tag &lt;&lt; " height=\"#$1\"" if dim =~ /pixelHeight: (\d+)/
-
-    alt = File.basename(file, File.extname(file))
-    alt = alt.gsub(/[_-]+/, ' ').strip.gsub(/\b[a-z]/) { $&amp;.upcase }
-	tag &lt;&lt; " alt=\"\${#{tab_stop+1}:#{e_snp(CGI::escapeHTML alt)}}\""
-
-	tag &lt;&lt; "#{ENV['TM_XHTML']}&gt;"
-end
-
-if ENV.has_key? 'TM_DROPPED_FILES'
-	files = Shellwords.shellwords(ENV['TM_DROPPED_FILES'])
-	files.each_with_index do |file, tab_stop|
-		STDOUT &lt;&lt; tag_for_file(file, tab_stop) &lt;&lt; "\n"
-	end
-else
-	STDOUT &lt;&lt; tag_for_file(ENV['TM_DROPPED_FILE'])
-end
-</string>
-	<key>draggedFileExtensions</key>
-	<array>
-		<string>png</string>
-		<string>jpeg</string>
-		<string>jpg</string>
-		<string>gif</string>
-	</array>
-	<key>name</key>
-	<string>Insert Image With Dimensions</string>
-	<key>output</key>
-	<string>insertAsSnippet</string>
-	<key>scope</key>
-	<string>text.html</string>
-	<key>uuid</key>
-	<string>CD6D2CC6-6B33-11D9-BDFD-000D93589AF6</string>
-</dict>
-</plist>
diff --git a/bundles/html.tmbundle/DragCommands/Insert Anchor href 2.tmDragCommand b/bundles/html.tmbundle/DragCommands/Insert Anchor href 2.tmDragCommand
deleted file mode 100644
index 2ab295422..000000000
--- a/bundles/html.tmbundle/DragCommands/Insert Anchor href 2.tmDragCommand	
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>command</key>
-	<string>title=`echo $TM_DROPPED_FILE | perl -pe 's/^(.*\/)?(.*?)(\..*)?$/$2/g'`
-echo -n "href=\"$TM_DROPPED_FILE\" title=\"\${1:$title}\" "</string>
-	<key>draggedFileExtensions</key>
-	<array>
-		<string>html</string>
-		<string>htm</string>
-		<string>rhtml</string>
-		<string>shtml</string>
-		<string>phtml</string>
-		<string>php</string>
-		<string>php3</string>
-		<string>php4</string>
-		<string>php5</string>
-		<string>cfm</string>
-		<string>cfml</string>
-		<string>dbm</string>
-		<string>dbml</string>
-	</array>
-	<key>name</key>
-	<string>Insert Anchor href</string>
-	<key>output</key>
-	<string>insertAsSnippet</string>
-	<key>scope</key>
-	<string>text.html meta.tag entity.other.attribute-name -string.quoted</string>
-	<key>uuid</key>
-	<string>6F71B1E5-81D0-4D94-A2C5-7688A3D3EDB3</string>
-</dict>
-</plist>
diff --git a/bundles/html.tmbundle/DragCommands/Insert Anchor href.tmDragCommand b/bundles/html.tmbundle/DragCommands/Insert Anchor href.tmDragCommand
deleted file mode 100644
index 8bf0412c9..000000000
--- a/bundles/html.tmbundle/DragCommands/Insert Anchor href.tmDragCommand	
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>command</key>
-	<string>title=`echo $TM_DROPPED_FILE | perl -pe 's/^(.*\/)?(.*?)(\..*)?$/$2/g'`
-echo -n " href=\"$TM_DROPPED_FILE\" title=\"\${1:$title}\""</string>
-	<key>draggedFileExtensions</key>
-	<array>
-		<string>html</string>
-		<string>htm</string>
-		<string>rhtml</string>
-		<string>shtml</string>
-		<string>phtml</string>
-		<string>php</string>
-		<string>php3</string>
-		<string>php4</string>
-		<string>php5</string>
-		<string>cfm</string>
-		<string>cfml</string>
-		<string>dbm</string>
-		<string>dbml</string>
-	</array>
-	<key>name</key>
-	<string>Insert Anchor href</string>
-	<key>output</key>
-	<string>insertAsSnippet</string>
-	<key>scope</key>
-	<string>text.html meta.tag -string.quoted -entity</string>
-	<key>uuid</key>
-	<string>BD4AEF38-638B-4C47-A762-4A0A6190F9C7</string>
-</dict>
-</plist>
diff --git a/bundles/html.tmbundle/DragCommands/Insert Flash Movie (Swf).tmDragCommand b/bundles/html.tmbundle/DragCommands/Insert Flash Movie (Swf).tmDragCommand
deleted file mode 100644
index caaf19ec2..000000000
--- a/bundles/html.tmbundle/DragCommands/Insert Flash Movie (Swf).tmDragCommand	
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>command</key>
-	<string>#!/usr/bin/ruby
-
-require "zlib"
-
-# Test for broken pack/unpack
-if [1].pack('n') == "\001\000"
-  class String
-    alias_method :broken_unpack, :unpack
-    def unpack(spec)
-      broken_unpack(spec.tr("nNvV","vVnN"))
-    end
-  end
-  class Array
-    alias_method :broken_pack, :pack
-    def pack(spec)
-      broken_pack(spec.tr("nNvV","vVnN"))
-    end
-  end
-end
-
-class Swf
-  @bits
-  @width
-  @height
-  @version
-  @bgcolor
-  @buffer
-  
-  
-  attr_reader :width
-  attr_reader :height
-  attr_reader :version
-  attr_reader :bgcolor
-  
-  def initialize(f)
-    @bits = ""
-    @buffer = File.new(f,"r").read
-    is_zip = ("" &lt;&lt; @buffer.slice(0)) == "C"
-    @version = @buffer.slice(3).to_i
-    
-    @buffer.slice!(0..7)
-    
-    if is_zip
-      @buffer = Zlib::Inflate.inflate(@buffer)
-    end
-    
-    nbits = getBits(5)
-    xmin = getBits(nbits)
-    xmax = getBits(nbits)
-    ymin = getBits(nbits)
-    ymax = getBits(nbits)
-    
-    @width = (xmax - xmin) / 20
-    @height = (ymax - ymin) / 20
-    
-    @buffer.slice!(0..3)
-    
-    @bits = ""
-    
-    while(true)
-      tag = getNextTag()
-      if(tag[:id] == 9)
-        @bgcolor = sprintf("#%02X%02X%02X", tag[:data][0], tag[:data][1], tag[:data][2])
-        break
-      end
-    end
-    
-  end
-  
-private
-
-  def getNextTag()
-    tag_and_size = @buffer.slice!(0..1).unpack("v")[0]
-    tag = {}
-    tag[:id] = tag_and_size &gt;&gt; 6
-    tag[:length] = tag_and_size &amp; 0x3f
-    if(tag[:length] == 63)
-      tag[:length] = @buffer.slice!(0..3).unpack("V")[0]
-    end
-    
-    tag[:data] = @buffer.slice!(0...tag[:length])
-    return tag
-  end
-  
-  def getBits(n)
-    bytes = (n / 8.0).ceil
-    (0...bytes).each {
-      @bits &lt;&lt; sprintf("%08b", @buffer.slice!(0))
-    }
-    out = @bits[0...n].to_i(2);
-    @bits = @bits[n..-1]
-    return out
-  end
-  
-end
-
-file = ENV["TM_DROPPED_FILE"] || "test.swf"
-name = file.match(/([^\/]+)\.swf$/)[1]
-swf = Swf.new(file)
-
-if (ENV["TM_MODIFIER_FLAGS"] == "OPTION")
-print &lt;&lt;HTML
-$1&lt;div id="${10:#{name}}"&gt;&lt;/div&gt;
-&lt;script type="text/javascript" charset="utf-8"&gt;
-    var so = new SWFObject("#{file}", "${20:#{name}_swf}", "#{swf.width}", "#{swf.height}", "#{swf.version}", "#{swf.bgcolor}");
-    so.write("$10");
-&lt;/script&gt;
-HTML
-else
-xhtml = ENV['TM_XHTML']
-print &lt;&lt;HTML
-&lt;object classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" codebase="http://fpdownload.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=#{swf.version},0,0,0" width="#{swf.width}" height="#{swf.height}" id="#{name}" align="middle"&gt;
-&lt;param name="allowScriptAccess" value="sameDomain"#{xhtml}&gt;
-&lt;param name="movie" value="#{file}"#{xhtml}&gt;
-&lt;param name="quality" value="high"#{xhtml}&gt;
-&lt;param name="bgcolor" value="#{swf.bgcolor}"#{xhtml}&gt;
-&lt;embed src="#{file}" quality="high" bgcolor="#{swf.bgcolor}" width="#{swf.width}" height="#{swf.height}" name="#{name}" align="middle" allowScriptAccess="sameDomain" type="application/x-shockwave-flash" pluginspage="http://www.macromedia.com/go/getflashplayer"#{xhtml}&gt;
-&lt;/object&gt;
-HTML
-end</string>
-	<key>draggedFileExtensions</key>
-	<array>
-		<string>swf</string>
-	</array>
-	<key>input</key>
-	<string>selection</string>
-	<key>name</key>
-	<string>Insert Flash Movie (Swf)</string>
-	<key>output</key>
-	<string>insertAsSnippet</string>
-	<key>scope</key>
-	<string>text.html</string>
-	<key>uuid</key>
-	<string>92F77050-74F9-4DF7-9A6E-2B42641849F7</string>
-</dict>
-</plist>
diff --git a/bundles/html.tmbundle/DragCommands/Insert JS Link.tmDragCommand b/bundles/html.tmbundle/DragCommands/Insert JS Link.tmDragCommand
deleted file mode 100644
index 54d128d0c..000000000
--- a/bundles/html.tmbundle/DragCommands/Insert JS Link.tmDragCommand	
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>bundleUUID</key>
-	<string>4676FC6D-6227-11D9-BFB1-000D93589AF6</string>
-	<key>command</key>
-	<string>echo "&lt;script src=\"$TM_DROPPED_FILE\" type=\"text/javascript\" charset=\"utf-8\"&gt;&lt;/script&gt;"</string>
-	<key>draggedFileExtensions</key>
-	<array>
-		<string>js</string>
-	</array>
-	<key>name</key>
-	<string>Insert JS Link</string>
-	<key>output</key>
-	<string>insertAsSnippet</string>
-	<key>scope</key>
-	<string>text.html</string>
-	<key>uuid</key>
-	<string>52124611-B363-40AD-B9F0-0A811941CD20</string>
-</dict>
-</plist>
diff --git a/bundles/html.tmbundle/DragCommands/Insert QuickTime Movie.tmDragCommand b/bundles/html.tmbundle/DragCommands/Insert QuickTime Movie.tmDragCommand
deleted file mode 100644
index e63fde61e..000000000
--- a/bundles/html.tmbundle/DragCommands/Insert QuickTime Movie.tmDragCommand	
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>command</key>
-	<string>DIM=$(osascript &lt;&lt;APPLESCRIPT
-	tell app "QuickTime Player"
-		open POSIX file "$TM_DROPPED_FILEPATH"
-		set w to item 1 of (get dimensions of movie 1)
-		set h to item 2 of (get dimensions of movie 1)
-		close movie 1
-		return "width=\"" &amp; w &amp; "\" height=\"" &amp; h &amp; "\""
-	end tell
-APPLESCRIPT
-)
-
-cat &lt;&lt;SNIPPET
-&lt;object $DIM classid="clsid:02BF25D5-8C17-4B23-BC80-D3488ABDDC6B" codebase="http://www.apple.com/qtactivex/qtplugin.cab"&gt;
-	&lt;param name="src" value="$TM_DROPPED_FILE"${TM_XHTML}&gt;
-	&lt;param name="controller" value="\$1"${TM_XHTML}&gt;
-	&lt;param name="autoplay" value="\$2"${TM_XHTML}&gt;
-	&lt;embed src="$TM_DROPPED_FILE"
-		$DIM
-		controller="\${1:true}" autoplay="\${2:true}"
-		scale="tofit" cache="true"
-		pluginspage="http://www.apple.com/quicktime/download/"
-	${TM_XHTML}&gt;
-&lt;/object&gt;
-SNIPPET
-</string>
-	<key>draggedFileExtensions</key>
-	<array>
-		<string>mov</string>
-	</array>
-	<key>input</key>
-	<string>selection</string>
-	<key>name</key>
-	<string>Insert QuickTime Movie</string>
-	<key>output</key>
-	<string>insertAsSnippet</string>
-	<key>scope</key>
-	<string>text.html</string>
-	<key>uuid</key>
-	<string>EBE53CE6-AEBB-4318-AE98-D07F3755E3F9</string>
-</dict>
-</plist>
diff --git a/bundles/html.tmbundle/DragCommands/Insert URL.tmDragCommand b/bundles/html.tmbundle/DragCommands/Insert URL.tmDragCommand
deleted file mode 100644
index 7363338b7..000000000
--- a/bundles/html.tmbundle/DragCommands/Insert URL.tmDragCommand	
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>command</key>
-	<string>title=`echo $TM_DROPPED_FILE | perl -pe 's/^(.*\/)?(.*?)(\..*)?$/$2/g'`
-echo -n "$TM_DROPPED_FILE\" title=\"\${1:$title}"</string>
-	<key>draggedFileExtensions</key>
-	<array>
-		<string>html</string>
-		<string>htm</string>
-		<string>rhtml</string>
-		<string>shtml</string>
-		<string>phtml</string>
-		<string>php</string>
-		<string>php3</string>
-		<string>php4</string>
-		<string>php5</string>
-		<string>cfm</string>
-		<string>cfml</string>
-		<string>dbm</string>
-		<string>dbml</string>
-	</array>
-	<key>name</key>
-	<string>Insert URL</string>
-	<key>output</key>
-	<string>insertAsSnippet</string>
-	<key>scope</key>
-	<string>text.html meta.tag string.quoted</string>
-	<key>uuid</key>
-	<string>30130739-4E58-4720-9B27-88C7EE168D83</string>
-</dict>
-</plist>
diff --git a/bundles/html.tmbundle/Macros/Delete whitespace between tags.plist b/bundles/html.tmbundle/Macros/Delete whitespace between tags.plist
deleted file mode 100644
index abc082e82..000000000
--- a/bundles/html.tmbundle/Macros/Delete whitespace between tags.plist	
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>commands</key>
-	<array>
-		<dict>
-			<key>argument</key>
-			<dict>
-				<key>action</key>
-				<string>findNext</string>
-				<key>findInProjectIgnoreCase</key>
-				<integer>0</integer>
-				<key>findString</key>
-				<string>(?=\S)|\s+</string>
-				<key>ignoreCase</key>
-				<integer>0</integer>
-				<key>regularExpression</key>
-				<integer>1</integer>
-				<key>replaceAllScope</key>
-				<string>document</string>
-				<key>wrapAround</key>
-				<integer>0</integer>
-			</dict>
-			<key>command</key>
-			<string>findWithOptions:</string>
-		</dict>
-		<dict>
-			<key>command</key>
-			<string>deleteBackward:</string>
-		</dict>
-	</array>
-	<key>keyEquivalent</key>
-	<string>^~</string>
-	<key>name</key>
-	<string>Forward Delete All Whitespace</string>
-	<key>scope</key>
-	<string>text.html</string>
-	<key>uuid</key>
-	<string>7B7E945E-A112-11D9-A5A2-000D93C8BE28</string>
-</dict>
-</plist>
diff --git a/bundles/html.tmbundle/Preferences/Comments.plist b/bundles/html.tmbundle/Preferences/Comments.plist
deleted file mode 100644
index ad25a4ec0..000000000
--- a/bundles/html.tmbundle/Preferences/Comments.plist
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>name</key>
-	<string>Comments</string>
-	<key>scope</key>
-	<string>text.html</string>
-	<key>settings</key>
-	<dict>
-		<key>shellVariables</key>
-		<array>
-			<dict>
-				<key>name</key>
-				<string>TM_COMMENT_START</string>
-				<key>value</key>
-				<string>&lt;!-- </string>
-			</dict>
-			<dict>
-				<key>name</key>
-				<string>TM_COMMENT_END</string>
-				<key>value</key>
-				<string> --&gt;</string>
-			</dict>
-		</array>
-	</dict>
-	<key>uuid</key>
-	<string>B79BDBCF-D0C9-468E-BE62-744074D7825F</string>
-</dict>
-</plist>
diff --git a/bundles/html.tmbundle/Preferences/Completions HTML Attributes.tmPreferences b/bundles/html.tmbundle/Preferences/Completions HTML Attributes.tmPreferences
deleted file mode 100644
index ae59eeaf5..000000000
--- a/bundles/html.tmbundle/Preferences/Completions HTML Attributes.tmPreferences	
+++ /dev/null
@@ -1,346 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>name</key>
-	<string>Completions HTML Attributes</string>
-	<key>scope</key>
-	<string>text.html meta.tag -(entity.other.attribute-name | punctuation.definition.tag.begin | source | entity.name.tag | string | invalid.illegal.incomplete.html)</string>
-	<key>settings</key>
-	<dict>
-		<key>completions</key>
-		<array>
-			<string>ABBR</string>
-			<string>abbr</string>
-			<string>ABOVE</string>
-			<string>above</string>
-			<string>ACCEPT</string>
-			<string>accept</string>
-			<string>ACCESSKEY</string>
-			<string>accesskey</string>
-			<string>ACTION</string>
-			<string>action</string>
-			<string>ALIGN</string>
-			<string>align</string>
-			<string>ALINK</string>
-			<string>alink</string>
-			<string>ALT</string>
-			<string>alt</string>
-			<string>ARCHIVE</string>
-			<string>archive</string>
-			<string>AUTOSTART</string>
-			<string>autostart</string>
-			<string>AXIS</string>
-			<string>axis</string>
-			<string>BACKGROUND</string>
-			<string>background</string>
-			<string>BALANCE</string>
-			<string>balance</string>
-			<string>BEHAVIOR</string>
-			<string>behavior</string>
-			<string>BELOW</string>
-			<string>below</string>
-			<string>BGCOLOR</string>
-			<string>bgcolor</string>
-			<string>BGPROPERTIES</string>
-			<string>bgproperties</string>
-			<string>BORDER</string>
-			<string>border</string>
-			<string>BORDERCOLOR</string>
-			<string>bordercolor</string>
-			<string>BORDERCOLORDARK</string>
-			<string>bordercolordark</string>
-			<string>BORDERCOLORLIGHT</string>
-			<string>bordercolorlight</string>
-			<string>BOTTOMMARGIN</string>
-			<string>bottommargin</string>
-			<string>CABBASE</string>
-			<string>cabbase</string>
-			<string>CELLPADDING</string>
-			<string>cellpadding</string>
-			<string>CELLSPACING</string>
-			<string>cellspacing</string>
-			<string>CHARSET</string>
-			<string>charset</string>
-			<string>CHECKED</string>
-			<string>checked</string>
-			<string>CITE</string>
-			<string>cite</string>
-			<string>CLASS</string>
-			<string>class</string>
-			<string>CLASSID</string>
-			<string>classid</string>
-			<string>CLEAR</string>
-			<string>clear</string>
-			<string>CLIP</string>
-			<string>clip</string>
-			<string>CODE</string>
-			<string>code</string>
-			<string>CODEBASE</string>
-			<string>codebase</string>
-			<string>CODETYPE</string>
-			<string>codetype</string>
-			<string>COLOR</string>
-			<string>color</string>
-			<string>COLS</string>
-			<string>cols</string>
-			<string>COLSPAN</string>
-			<string>colspan</string>
-			<string>COMPACT</string>
-			<string>compact</string>
-			<string>CONTENT</string>
-			<string>content</string>
-			<string>CONTROLS</string>
-			<string>controls</string>
-			<string>COORDS</string>
-			<string>coords</string>
-			<string>DATA</string>
-			<string>data</string>
-			<string>DATAPAGESIZE</string>
-			<string>datapagesize</string>
-			<string>DATETIME</string>
-			<string>datetime</string>
-			<string>DECLARE</string>
-			<string>declare</string>
-			<string>DEFER</string>
-			<string>defer</string>
-			<string>DELAY</string>
-			<string>delay</string>
-			<string>DIR</string>
-			<string>dir</string>
-			<string>DIRECTION</string>
-			<string>direction</string>
-			<string>DISABLED</string>
-			<string>disabled</string>
-			<string>DYNSRC</string>
-			<string>dynsrc</string>
-			<string>ENCTYPE</string>
-			<string>enctype</string>
-			<string>FACE</string>
-			<string>face</string>
-			<string>FOR</string>
-			<string>for</string>
-			<string>FRAME</string>
-			<string>frame</string>
-			<string>FRAMEBORDER</string>
-			<string>frameborder</string>
-			<string>FRAMESPACING</string>
-			<string>framespacing</string>
-			<string>GUTTER</string>
-			<string>gutter</string>
-			<string>HEADERS</string>
-			<string>headers</string>
-			<string>HEIGHT</string>
-			<string>height</string>
-			<string>HIDDEN</string>
-			<string>hidden</string>
-			<string>HREF</string>
-			<string>href</string>
-			<string>HREFLANG</string>
-			<string>hreflang</string>
-			<string>HSPACE</string>
-			<string>hspace</string>
-			<string>HTTP-EQUIV</string>
-			<string>http-equiv</string>
-			<string>ID</string>
-			<string>id</string>
-			<string>ISMAP</string>
-			<string>ismap</string>
-			<string>LABEL</string>
-			<string>label</string>
-			<string>LANG</string>
-			<string>lang</string>
-			<string>lang</string>
-			<string>language</string>
-			<string>LEFT</string>
-			<string>left</string>
-			<string>LEFTMARGIN</string>
-			<string>leftmargin</string>
-			<string>LINK</string>
-			<string>link</string>
-			<string>LONGDESC</string>
-			<string>longdesc</string>
-			<string>LOOP</string>
-			<string>loop</string>
-			<string>LOWSRC</string>
-			<string>lowsrc</string>
-			<string>MARGINHEIGHT</string>
-			<string>marginheight</string>
-			<string>MARGINWIDTH</string>
-			<string>marginwidth</string>
-			<string>MAXLENGTH</string>
-			<string>maxlength</string>
-			<string>MAYSCRIPT</string>
-			<string>mayscript</string>
-			<string>MEDIA</string>
-			<string>media</string>
-			<string>METHOD</string>
-			<string>method</string>
-			<string>MULTIPLE</string>
-			<string>multiple</string>
-			<string>NAME</string>
-			<string>name</string>
-			<string>NOEXTERNALDATA</string>
-			<string>noexternaldata</string>
-			<string>NORESIZE</string>
-			<string>noresize</string>
-			<string>NOSHADE</string>
-			<string>noshade</string>
-			<string>NOWRAP</string>
-			<string>nowrap</string>
-			<string>onBlur</string>
-			<string>onblur</string>
-			<string>onChange</string>
-			<string>onchange</string>
-			<string>onClick</string>
-			<string>onclick</string>
-			<string>onDblClick</string>
-			<string>ondblclick</string>
-			<string>onError</string>
-			<string>onerror</string>
-			<string>onFocus</string>
-			<string>onfocus</string>
-			<string>onKeyDown</string>
-			<string>onkeydown</string>
-			<string>onKeyPress</string>
-			<string>onkeypress</string>
-			<string>onKeyUp</string>
-			<string>onkeyup</string>
-			<string>onLoad</string>
-			<string>onload</string>
-			<string>onMouseDown</string>
-			<string>onmousedown</string>
-			<string>onMouseMove</string>
-			<string>onmousemove</string>
-			<string>onMouseOut</string>
-			<string>onmouseout</string>
-			<string>onMouseOver</string>
-			<string>onmouseover</string>
-			<string>onMouseUp</string>
-			<string>onmouseup</string>
-			<string>onReset</string>
-			<string>onreset</string>
-			<string>onResize</string>
-			<string>onresize</string>
-			<string>onSelect</string>
-			<string>onselect</string>
-			<string>onSubmit</string>
-			<string>onsubmit</string>
-			<string>onUnload</string>
-			<string>onunload</string>
-			<string>PAGEX</string>
-			<string>pagex</string>
-			<string>PAGEY</string>
-			<string>pagey</string>
-			<string>POINTSIZE</string>
-			<string>pointsize</string>
-			<string>READONLY</string>
-			<string>readonly</string>
-			<string>REL</string>
-			<string>rel</string>
-			<string>REV</string>
-			<string>rev</string>
-			<string>RIGHTMARGIN</string>
-			<string>rightmargin</string>
-			<string>ROWS</string>
-			<string>rows</string>
-			<string>ROWSPAN</string>
-			<string>rowspan</string>
-			<string>RULES</string>
-			<string>rules</string>
-			<string>runat</string>
-			<string>SCOPE</string>
-			<string>scope</string>
-			<string>SCROLLAMOUNT</string>
-			<string>scrollamount</string>
-			<string>SCROLLDELAY</string>
-			<string>scrolldelay</string>
-			<string>SCROLLING</string>
-			<string>scrolling</string>
-			<string>SELECTED</string>
-			<string>selected</string>
-			<string>SHAPE</string>
-			<string>shape</string>
-			<string>SIZE</string>
-			<string>size</string>
-			<string>SPAN</string>
-			<string>span</string>
-			<string>SRC</string>
-			<string>src</string>
-			<string>STANDBY</string>
-			<string>standby</string>
-			<string>START</string>
-			<string>start</string>
-			<string>STYLE</string>
-			<string>style</string>
-			<string>SUMMARY</string>
-			<string>summary</string>
-			<string>TABINDEX</string>
-			<string>tabindex</string>
-			<string>TARGET</string>
-			<string>target</string>
-			<string>TEXT</string>
-			<string>text</string>
-			<string>TITLE</string>
-			<string>title</string>
-			<string>TOP</string>
-			<string>top</string>
-			<string>TOPMARGIN</string>
-			<string>topmargin</string>
-			<string>TRUESPEED</string>
-			<string>truespeed</string>
-			<string>TYPE</string>
-			<string>type</string>
-			<string>USEMAP</string>
-			<string>usemap</string>
-			<string>VALIGN</string>
-			<string>valign</string>
-			<string>VALUE</string>
-			<string>value</string>
-			<string>VALUETYPE</string>
-			<string>valuetype</string>
-			<string>VISIBILITY</string>
-			<string>visibility</string>
-			<string>VLINK</string>
-			<string>vlink</string>
-			<string>VOLUME</string>
-			<string>volume</string>
-			<string>VSPACE</string>
-			<string>vspace</string>
-			<string>WIDTH</string>
-			<string>width</string>
-			<string>WRAP</string>
-			<string>wrap</string>
-			<string>xml:lang</string>
-			<string>xmlns</string>
-			<string>Z-INDEX</string>
-			<string>z-index</string>
-		</array>
-		<key>disableDefaultCompletion</key>
-		<integer>1</integer>
-		<key>shellVariables</key>
-		<array>
-			<dict>
-				<key>name</key>
-				<string>TM_COMPLETION_split</string>
-				<key>value</key>
-				<string>,</string>
-			</dict>
-			<dict>
-				<key>name</key>
-				<string>TM_COMPLETION_scope</string>
-				<key>value</key>
-				<string>html_attributes</string>
-			</dict>
-			<dict>
-				<key>name</key>
-				<string>TM_COMPLETIONS</string>
-				<key>value</key>
-				<string>&lt;a href="",&lt;a name="",&lt;a title="",&lt;a target="",&lt;a charset="",&lt;a class="",&lt;a id="",&lt;a style="",&lt;a hreflang="",&lt;a accesskey="",&lt;a tabindex="",&lt;a rel="",&lt;a rev="",&lt;a shape="",&lt;a coords="",&lt;a dir="",&lt;a lang="",&lt;a onfocus="",&lt;a onblur="",&lt;a onclick="",&lt;a ondblclick="",&lt;a onmousedown="",&lt;a onmouseup="",&lt;a onmouseover="",&lt;a onmousemove="",&lt;a onmouseout="",&lt;a onkeypress="",&lt;a onkeydown="",&lt;a onkeyup="",&lt;abbr class="",&lt;abbr id="",&lt;abbr style="",&lt;abbr title="",&lt;abbr dir="",&lt;abbr lang="",&lt;abbr onclick="",&lt;abbr ondblclick="",&lt;abbr onmousedown="",&lt;abbr onmouseup="",&lt;abbr onmouseover="",&lt;abbr onmousemove="",&lt;abbr onmouseout="",&lt;abbr onkeypress="",&lt;abbr onkeydown="",&lt;abbr onkeyup="",&lt;acronym class="",&lt;acronym id="",&lt;acronym style="",&lt;acronym title="",&lt;acronym dir="",&lt;acronym lang="",&lt;acronym onclick="",&lt;acronym ondblclick="",&lt;acronym onmousedown="",&lt;acronym onmouseup="",&lt;acronym onmouseover="",&lt;acronym onmousemove="",&lt;acronym onmouseout="",&lt;acronym onkeypress="",&lt;acronym onkeydown="",&lt;acronym onkeyup="",&lt;address class="",&lt;address id="",&lt;address style="",&lt;address title="",&lt;address dir="",&lt;address lang="",&lt;address onclick="",&lt;address ondblclick="",&lt;address onmousedown="",&lt;address onmouseup="",&lt;address onmouseover="",&lt;address onmousemove="",&lt;address onmouseout="",&lt;address onkeypress="",&lt;address onkeydown="",&lt;address onkeyup="",&lt;applet noexternaldata="",&lt;applet code="",&lt;applet codebase="",&lt;applet name="",&lt;applet alt="",&lt;applet width="",&lt;applet height="",&lt;applet hspace="",&lt;applet vspace="",&lt;applet align="",&lt;applet cabbase="",&lt;applet mayscript="",&lt;applet archive="",&lt;applet class="",&lt;applet id="",&lt;applet style="",&lt;area name="",&lt;area value="",&lt;area shape="",&lt;area coords="",&lt;area href="",&lt;area target="",&lt;area alt="",&lt;area disabled="disabled",&lt;area class="",&lt;area id="",&lt;area style="",&lt;area accesskey="",&lt;area tabindex="",&lt;area title="",&lt;area dir="",&lt;area lang="",&lt;area onfocus="",&lt;area onblur="",&lt;area onclick="",&lt;area ondblclick="",&lt;area onmousedown="",&lt;area onmouseup="",&lt;area onmouseover="",&lt;area onmousemove="",&lt;area onmouseout="",&lt;area onkeypress="",&lt;area onkeydown="",&lt;area onkeyup="",&lt;b class="",&lt;b id="",&lt;b style="",&lt;b title="",&lt;b dir="",&lt;b lang="",&lt;b onclick="",&lt;b ondblclick="",&lt;b onmousedown="",&lt;b onmouseup="",&lt;b onmouseover="",&lt;b onmousemove="",&lt;b onmouseout="",&lt;b onkeypress="",&lt;b onkeydown="",&lt;b onkeyup="",&lt;base href="",&lt;base target="",&lt;basefont size="",&lt;basefont face="",&lt;basefont color="#333333",&lt;basefont id="",&lt;bdo dir="",&lt;bdo lang="",&lt;bdo class="",&lt;bdo id="",&lt;bdo style="",&lt;bdo title="",&lt;bgsound src="",&lt;bgsound loop="",&lt;bgsound balance="",&lt;bgsound volume="",&lt;bgsound delay="",&lt;big class="",&lt;big id="",&lt;big style="",&lt;big title="",&lt;big dir="",&lt;big lang="",&lt;big onclick="",&lt;big ondblclick="",&lt;big onmousedown="",&lt;big onmouseup="",&lt;big onmouseover="",&lt;big onmousemove="",&lt;big onmouseout="",&lt;big onkeypress="",&lt;big onkeydown="",&lt;big onkeyup="",&lt;blockquote cite="",&lt;blockquote class="",&lt;blockquote id="",&lt;blockquote style="",&lt;blockquote title="",&lt;blockquote dir="",&lt;blockquote lang="",&lt;blockquote onclick="",&lt;blockquote ondblclick="",&lt;blockquote onmousedown="",&lt;blockquote onmouseup="",&lt;blockquote onmouseover="",&lt;blockquote onmousemove="",&lt;blockquote onmouseout="",&lt;blockquote onkeypress="",&lt;blockquote onkeydown="",&lt;blockquote onkeyup="",&lt;body bgcolor="",&lt;body background="",&lt;body text="",&lt;body link="",&lt;body vlink="",&lt;body alink="",&lt;body leftmargin="",&lt;body topmargin="",&lt;body bgproperties="",&lt;body rightmargin="",&lt;body bottommargin="",&lt;body marginwidth="",&lt;body marginheight="",&lt;body class="",&lt;body id="",&lt;body style="",&lt;body title="",&lt;body dir="",&lt;body lang="",&lt;body onload="",&lt;body onunload="",&lt;body onblur="",&lt;body onerror="",&lt;body onfocus="",&lt;body onresize="",&lt;br clear="",&lt;br class="",&lt;br id="",&lt;br style="",&lt;br title="",&lt;button name="",&lt;button value="",&lt;button type="",&lt;button disabled="disabled",&lt;button class="",&lt;button id="",&lt;button style="",&lt;button accesskey="",&lt;button tabindex="",&lt;button title="",&lt;button dir="",&lt;button lang="",&lt;button onfocus="",&lt;button onblur="",&lt;button onclick="",&lt;button ondblclick="",&lt;button onmousedown="",&lt;button onmouseup="",&lt;button onmouseover="",&lt;button onmousemove="",&lt;button onmouseout="",&lt;button onkeypress="",&lt;button onkeydown="",&lt;button onkeyup="",&lt;caption align="",&lt;caption valign="",&lt;caption class="",&lt;caption id="",&lt;caption style="",&lt;caption title="",&lt;caption dir="",&lt;caption lang="",&lt;caption onclick="",&lt;caption ondblclick="",&lt;caption onmousedown="",&lt;caption onmouseup="",&lt;caption onmouseover="",&lt;caption onmousemove="",&lt;caption onmouseout="",&lt;caption onkeypress="",&lt;caption onkeydown="",&lt;caption onkeyup="",&lt;cite class="",&lt;cite id="",&lt;cite style="",&lt;cite title="",&lt;cite dir="",&lt;cite lang="",&lt;cite onclick="",&lt;cite ondblclick="",&lt;cite onmousedown="",&lt;cite onmouseup="",&lt;cite onmouseover="",&lt;cite onmousemove="",&lt;cite onmouseout="",&lt;cite onkeypress="",&lt;cite onkeydown="",&lt;cite onkeyup="",&lt;code class="",&lt;code id="",&lt;code style="",&lt;code title="",&lt;code dir="",&lt;code lang="",&lt;code onclick="",&lt;code ondblclick="",&lt;code onmousedown="",&lt;code onmouseup="",&lt;code onmouseover="",&lt;code onmousemove="",&lt;code onmouseout="",&lt;code onkeypress="",&lt;code onkeydown="",&lt;code onkeyup="",&lt;col align="",&lt;col valign="",&lt;col span="",&lt;col width="",&lt;col class="",&lt;col id="",&lt;col style="",&lt;col title="",&lt;col dir="",&lt;col lang="",&lt;col onclick="",&lt;col ondblclick="",&lt;col onmousedown="",&lt;col onmouseup="",&lt;col onmouseover="",&lt;col onmousemove="",&lt;col onmouseout="",&lt;col onkeypress="",&lt;col onkeydown="",&lt;col onkeyup="",&lt;colgroup align="",&lt;colgroup valign="",&lt;colgroup span="",&lt;colgroup width="",&lt;colgroup class="",&lt;colgroup id="",&lt;colgroup style="",&lt;colgroup title="",&lt;colgroup dir="",&lt;colgroup lang="",&lt;colgroup onclick="",&lt;colgroup ondblclick="",&lt;colgroup onmousedown="",&lt;colgroup onmouseup="",&lt;colgroup onmouseover="",&lt;colgroup onmousemove="",&lt;colgroup onmouseout="",&lt;colgroup onkeypress="",&lt;colgroup onkeydown="",&lt;colgroup onkeyup="",&lt;dd class="",&lt;dd id="",&lt;dd style="",&lt;dd title="",&lt;dd dir="",&lt;dd lang="",&lt;dd onclick="",&lt;dd ondblclick="",&lt;dd onmousedown="",&lt;dd onmouseup="",&lt;dd onmouseover="",&lt;dd onmousemove="",&lt;dd onmouseout="",&lt;dd onkeypress="",&lt;dd onkeydown="",&lt;dd onkeyup="",&lt;del cite="",&lt;del datetime="",&lt;del class="",&lt;del id="",&lt;del style="",&lt;del title="",&lt;del dir="",&lt;del lang="",&lt;del onclick="",&lt;del ondblclick="",&lt;del onmousedown="",&lt;del onmouseup="",&lt;del onmouseover="",&lt;del onmousemove="",&lt;del onmouseout="",&lt;del onkeypress="",&lt;del onkeydown="",&lt;del onkeyup="",&lt;dfn class="",&lt;dfn id="",&lt;dfn style="",&lt;dfn title="",&lt;dfn dir="",&lt;dfn lang="",&lt;dfn onclick="",&lt;dfn ondblclick="",&lt;dfn onmousedown="",&lt;dfn onmouseup="",&lt;dfn onmouseover="",&lt;dfn onmousemove="",&lt;dfn onmouseout="",&lt;dfn onkeypress="",&lt;dfn onkeydown="",&lt;dfn onkeyup="",&lt;div align="",&lt;div class="",&lt;div id="",&lt;div style="",&lt;div title="",&lt;div dir="",&lt;div lang="",&lt;div onclick="",&lt;div ondblclick="",&lt;div onmousedown="",&lt;div onmouseup="",&lt;div onmouseover="",&lt;div onmousemove="",&lt;div onmouseout="",&lt;div onkeypress="",&lt;div onkeydown="",&lt;div onkeyup="",&lt;dl compact="",&lt;dl class="",&lt;dl id="",&lt;dl style="",&lt;dl title="",&lt;dl dir="",&lt;dl lang="",&lt;dl onclick="",&lt;dl ondblclick="",&lt;dl onmousedown="",&lt;dl onmouseup="",&lt;dl onmouseover="",&lt;dl onmousemove="",&lt;dl onmouseout="",&lt;dl onkeypress="",&lt;dl onkeydown="",&lt;dl onkeyup="",&lt;dt class="",&lt;dt id="",&lt;dt style="",&lt;dt title="",&lt;dt dir="",&lt;dt lang="",&lt;dt onclick="",&lt;dt ondblclick="",&lt;dt onmousedown="",&lt;dt onmouseup="",&lt;dt onmouseover="",&lt;dt onmousemove="",&lt;dt onmouseout="",&lt;dt onkeypress="",&lt;dt onkeydown="",&lt;dt onkeyup="",&lt;em class="",&lt;em id="",&lt;em style="",&lt;em title="",&lt;em dir="",&lt;em lang="",&lt;em onclick="",&lt;em ondblclick="",&lt;em onmousedown="",&lt;em onmouseup="",&lt;em onmouseover="",&lt;em onmousemove="",&lt;em onmouseout="",&lt;em onkeypress="",&lt;em onkeydown="",&lt;em onkeyup="",&lt;embed src="",&lt;embed width="",&lt;embed height="",&lt;embed hspace="",&lt;embed vspace="",&lt;embed hidden="",&lt;embed autostart="",&lt;embed loop="",&lt;embed align="",&lt;embed class="",&lt;embed style="",&lt;embed dir="",&lt;embed lang="",&lt;fieldset class="",&lt;fieldset id="",&lt;fieldset style="",&lt;fieldset title="",&lt;fieldset accesskey="",&lt;fieldset dir="",&lt;fieldset lang="",&lt;fieldset onclick="",&lt;fieldset ondblclick="",&lt;fieldset onmousedown="",&lt;fieldset onmouseup="",&lt;fieldset onmouseover="",&lt;fieldset onmousemove="",&lt;fieldset onmouseout="",&lt;fieldset onkeypress="",&lt;fieldset onkeydown="",&lt;fieldset onkeyup="",&lt;font color="#333333",&lt;font size="",&lt;font face="",&lt;font pointsize="",&lt;font class="",&lt;font id="",&lt;font style="",&lt;font title="",&lt;font dir="",&lt;font lang="",&lt;form action="",&lt;form method="",&lt;form enctype="",&lt;form name="",&lt;form target="",&lt;form class="",&lt;form id="",&lt;form style="",&lt;form title="",&lt;form dir="",&lt;form lang="",&lt;form runat="",&lt;form onsubmit="",&lt;form onreset="",&lt;form onclick="",&lt;form ondblclick="",&lt;form onmousedown="",&lt;form onmouseup="",&lt;form onmouseover="",&lt;form onmousemove="",&lt;form onmouseout="",&lt;form onkeypress="",&lt;form onkeydown="",&lt;form onkeyup="",&lt;frame src="",&lt;frame name="",&lt;frame frameborder="",&lt;frame scrolling="",&lt;frame noresize="",&lt;frame marginwidth="",&lt;frame marginheight="",&lt;frame bordercolor="#CCCCCC",&lt;frame class="",&lt;frame id="",&lt;frame style="",&lt;frame title="",&lt;frame longdesc="",&lt;frameset rows="",&lt;frameset cols="",&lt;frameset framespacing="",&lt;frameset frameborder="",&lt;frameset border="",&lt;frameset bordercolor="#CCCCCC",&lt;frameset class="",&lt;frameset id="",&lt;frameset style="",&lt;frameset title="",&lt;frameset onload="",&lt;frameset onunload="",&lt;h1 align="",&lt;h1 class="",&lt;h1 id="",&lt;h1 style="",&lt;h1 title="",&lt;h1 dir="",&lt;h1 lang="",&lt;h1 onclick="",&lt;h1 ondblclick="",&lt;h1 onmousedown="",&lt;h1 onmouseup="",&lt;h1 onmouseover="",&lt;h1 onmousemove="",&lt;h1 onmouseout="",&lt;h1 onkeypress="",&lt;h1 onkeydown="",&lt;h1 onkeyup="",&lt;h2 align="",&lt;h2 class="",&lt;h2 id="",&lt;h2 style="",&lt;h2 title="",&lt;h2 dir="",&lt;h2 lang="",&lt;h2 onclick="",&lt;h2 ondblclick="",&lt;h2 onmousedown="",&lt;h2 onmouseup="",&lt;h2 onmouseover="",&lt;h2 onmousemove="",&lt;h2 onmouseout="",&lt;h2 onkeypress="",&lt;h2 onkeydown="",&lt;h2 onkeyup="",&lt;h3 align="",&lt;h3 class="",&lt;h3 id="",&lt;h3 style="",&lt;h3 title="",&lt;h3 dir="",&lt;h3 lang="",&lt;h3 onclick="",&lt;h3 ondblclick="",&lt;h3 onmousedown="",&lt;h3 onmouseup="",&lt;h3 onmouseover="",&lt;h3 onmousemove="",&lt;h3 onmouseout="",&lt;h3 onkeypress="",&lt;h3 onkeydown="",&lt;h3 onkeyup="",&lt;h4 align="",&lt;h4 class="",&lt;h4 id="",&lt;h4 style="",&lt;h4 title="",&lt;h4 dir="",&lt;h4 lang="",&lt;h4 onclick="",&lt;h4 ondblclick="",&lt;h4 onmousedown="",&lt;h4 onmouseup="",&lt;h4 onmouseover="",&lt;h4 onmousemove="",&lt;h4 onmouseout="",&lt;h4 onkeypress="",&lt;h4 onkeydown="",&lt;h4 onkeyup="",&lt;h5 align="",&lt;h5 class="",&lt;h5 id="",&lt;h5 style="",&lt;h5 title="",&lt;h5 dir="",&lt;h5 lang="",&lt;h5 onclick="",&lt;h5 ondblclick="",&lt;h5 onmousedown="",&lt;h5 onmouseup="",&lt;h5 onmouseover="",&lt;h5 onmousemove="",&lt;h5 onmouseout="",&lt;h5 onkeypress="",&lt;h5 onkeydown="",&lt;h5 onkeyup="",&lt;h6 align="",&lt;h6 class="",&lt;h6 id="",&lt;h6 style="",&lt;h6 title="",&lt;h6 dir="",&lt;h6 lang="",&lt;h6 onclick="",&lt;h6 ondblclick="",&lt;h6 onmousedown="",&lt;h6 onmouseup="",&lt;h6 onmouseover="",&lt;h6 onmousemove="",&lt;h6 onmouseout="",&lt;h6 onkeypress="",&lt;h6 onkeydown="",&lt;h6 onkeyup="",&lt;hr align="",&lt;hr width="",&lt;hr size="",&lt;hr noshade="",&lt;hr color="#333333",&lt;hr class="",&lt;hr id="",&lt;hr style="",&lt;hr title="",&lt;hr onclick="",&lt;hr ondblclick="",&lt;hr onmousedown="",&lt;hr onmouseup="",&lt;hr onmouseover="",&lt;hr onmousemove="",&lt;hr onmouseout="",&lt;hr onkeypress="",&lt;hr onkeydown="",&lt;hr onkeyup="",&lt;html xmlns="",&lt;html xml:lang="",&lt;html lang="",&lt;html dir="",&lt;i class="",&lt;i id="",&lt;i style="",&lt;i title="",&lt;i dir="",&lt;i lang="",&lt;i onclick="",&lt;i ondblclick="",&lt;i onmousedown="",&lt;i onmouseup="",&lt;i onmouseover="",&lt;i onmousemove="",&lt;i onmouseout="",&lt;i onkeypress="",&lt;i onkeydown="",&lt;i onkeyup="",&lt;iframe src="",&lt;iframe name="",&lt;iframe width="",&lt;iframe marginwidth="",&lt;iframe height="",&lt;iframe marginheight="",&lt;iframe align="",&lt;iframe scrolling="",&lt;iframe frameborder="",&lt;iframe hspace="",&lt;iframe vspace="",&lt;iframe class="",&lt;iframe id="",&lt;iframe style="",&lt;iframe title="",&lt;iframe longdesc="",&lt;ilayer name="",&lt;ilayer id="",&lt;ilayer left="",&lt;ilayer top="",&lt;ilayer pagex="",&lt;ilayer pagey="",&lt;ilayer above="",&lt;ilayer below="",&lt;ilayer z-index="",&lt;ilayer width="",&lt;ilayer height="",&lt;ilayer visibility="",&lt;ilayer clip="",&lt;ilayer bgcolor="",&lt;ilayer background="",&lt;ilayer src="",&lt;ilayer onfocus="",&lt;ilayer onblur="",&lt;ilayer onload="",&lt;ilayer onmouseover="",&lt;ilayer onmouseout="",&lt;img src="",&lt;img alt="",&lt;img name="",&lt;img width="",&lt;img height="",&lt;img hspace="",&lt;img vspace="",&lt;img border="",&lt;img align="",&lt;img usemap="",&lt;img ismap="ismap",&lt;img dynsrc="",&lt;img controls="",&lt;img start="",&lt;img loop="",&lt;img lowsrc="",&lt;img class="",&lt;img id="",&lt;img style="",&lt;img title="",&lt;img longdesc="",&lt;img dir="",&lt;img lang="",&lt;img onclick="",&lt;img ondblclick="",&lt;img onmousedown="",&lt;img onmouseup="",&lt;img onmouseover="",&lt;img onmousemove="",&lt;img onmouseout="",&lt;img onkeypress="",&lt;img onkeydown="",&lt;img onkeyup="",&lt;input name="",&lt;input type="",&lt;input disabled="disabled",&lt;input class="",&lt;input id="",&lt;input style="",&lt;input accesskey="",&lt;input tabindex="",&lt;input title="",&lt;input dir="",&lt;input lang="",&lt;input onfocus="",&lt;input onblur="",&lt;input onselect="",&lt;input onchange="",&lt;input onclick="",&lt;input ondblclick="",&lt;input onmousedown="",&lt;input onmouseup="",&lt;input onmouseover="",&lt;input onmousemove="",&lt;input onmouseout="",&lt;input onkeypress="",&lt;input onkeydown="",&lt;input onkeyup="",&lt;input value="",&lt;input size="",&lt;input maxlength="",&lt;input readonly="readonly",&lt;input checked="checked",&lt;input src="",&lt;input alt="",&lt;input align="",&lt;input usemap="",&lt;input width="",&lt;input height="",&lt;input hspace="",&lt;input vspace="",&lt;input border="",&lt;input accept="",&lt;ins cite="",&lt;ins datetime="",&lt;ins class="",&lt;ins id="",&lt;ins style="",&lt;ins title="",&lt;ins dir="",&lt;ins lang="",&lt;ins onclick="",&lt;ins ondblclick="",&lt;ins onmousedown="",&lt;ins onmouseup="",&lt;ins onmouseover="",&lt;ins onmousemove="",&lt;ins onmouseout="",&lt;ins onkeypress="",&lt;ins onkeydown="",&lt;ins onkeyup="",&lt;kbd class="",&lt;kbd id="",&lt;kbd style="",&lt;kbd title="",&lt;kbd dir="",&lt;kbd lang="",&lt;kbd onclick="",&lt;kbd ondblclick="",&lt;kbd onmousedown="",&lt;kbd onmouseup="",&lt;kbd onmouseover="",&lt;kbd onmousemove="",&lt;kbd onmouseout="",&lt;kbd onkeypress="",&lt;kbd onkeydown="",&lt;kbd onkeyup="",&lt;label for="",&lt;label class="",&lt;label id="",&lt;label style="",&lt;label accesskey="",&lt;label title="",&lt;label dir="",&lt;label lang="",&lt;label onfocus="",&lt;label onblur="",&lt;label onclick="",&lt;label ondblclick="",&lt;label onmousedown="",&lt;label onmouseup="",&lt;label onmouseover="",&lt;label onmousemove="",&lt;label onmouseout="",&lt;label onkeypress="",&lt;label onkeydown="",&lt;label onkeyup="",&lt;layer name="",&lt;layer left="",&lt;layer top="",&lt;layer pagex="",&lt;layer pagey="",&lt;layer above="",&lt;layer below="",&lt;layer z-index="",&lt;layer width="",&lt;layer height="",&lt;layer visibility="",&lt;layer clip="",&lt;layer bgcolor="",&lt;layer background="",&lt;layer src="",&lt;layer onfocus="",&lt;layer onblur="",&lt;layer onload="",&lt;layer onmouseover="",&lt;layer onmouseout="",&lt;legend align="",&lt;legend class="",&lt;legend id="",&lt;legend style="",&lt;legend accesskey="",&lt;legend title="",&lt;legend dir="",&lt;legend lang="",&lt;legend onclick="",&lt;legend ondblclick="",&lt;legend onmousedown="",&lt;legend onmouseup="",&lt;legend onmouseover="",&lt;legend onmousemove="",&lt;legend onmouseout="",&lt;legend onkeypress="",&lt;legend onkeydown="",&lt;legend onkeyup="",&lt;li type="",&lt;li value="",&lt;li class="",&lt;li id="",&lt;li style="",&lt;li title="",&lt;li dir="",&lt;li lang="",&lt;li onclick="",&lt;li ondblclick="",&lt;li onmousedown="",&lt;li onmouseup="",&lt;li onmouseover="",&lt;li onmousemove="",&lt;li onmouseout="",&lt;li onkeypress="",&lt;li onkeydown="",&lt;li onkeyup="",&lt;link href="",&lt;link rel="",&lt;link rev="",&lt;link title="",&lt;link type="",&lt;link media="",&lt;link disabled="disabled",&lt;link class="",&lt;link id="",&lt;link hreflang="",&lt;link style="",&lt;map name="",&lt;map class="",&lt;map id="",&lt;map style="",&lt;map title="",&lt;map dir="",&lt;map lang="",&lt;map onfocus="",&lt;map onblur="",&lt;map onclick="",&lt;map ondblclick="",&lt;map onmousedown="",&lt;map onmouseup="",&lt;map onmouseover="",&lt;map onmousemove="",&lt;map onmouseout="",&lt;map onkeypress="",&lt;map onkeydown="",&lt;map onkeyup="",&lt;var class="",&lt;var id="",&lt;var style="",&lt;var title="",&lt;var dir="",&lt;var lang="",&lt;var onclick="",&lt;var ondblclick="",&lt;var onmousedown="",&lt;var onmouseup="",&lt;var onmouseover="",&lt;var onmousemove="",&lt;var onmouseout="",&lt;var onkeypress="",&lt;var onkeydown="",&lt;var onkeyup="",&lt;ul type="",&lt;ul compact="",&lt;ul class="",&lt;ul id="",&lt;ul style="",&lt;ul title="",&lt;ul dir="",&lt;ul lang="",&lt;ul onclick="",&lt;ul ondblclick="",&lt;ul onmousedown="",&lt;ul onmouseup="",&lt;ul onmouseover="",&lt;ul onmousemove="",&lt;ul onmouseout="",&lt;ul onkeypress="",&lt;ul onkeydown="",&lt;ul onkeyup="",&lt;tt class="",&lt;tt id="",&lt;tt style="",&lt;tt title="",&lt;tt dir="",&lt;tt lang="",&lt;tt onclick="",&lt;tt ondblclick="",&lt;tt onmousedown="",&lt;tt onmouseup="",&lt;tt onmouseover="",&lt;tt onmousemove="",&lt;tt onmouseout="",&lt;tt onkeypress="",&lt;tt onkeydown="",&lt;tt onkeyup="",&lt;tr align="",&lt;tr valign="",&lt;tr bordercolor="#CCCCCC",&lt;tr bordercolorlight="",&lt;tr bordercolordark="",&lt;tr nowrap="",&lt;tr bgcolor="",&lt;tr class="",&lt;tr id="",&lt;tr style="",&lt;tr title="",&lt;tr dir="",&lt;tr lang="en",&lt;tr onclick="",&lt;tr ondblclick="",&lt;tr onmousedown="",&lt;tr onmouseup="",&lt;tr onmouseover="",&lt;tr onmousemove="",&lt;tr onmouseout="",&lt;tr onkeypress="",&lt;tr onkeydown="",&lt;tr onkeyup="",&lt;thead align="",&lt;thead valign="",&lt;thead bgcolor="",&lt;thead class="",&lt;thead id="",&lt;thead style="",&lt;thead title="",&lt;thead dir="",&lt;thead lang="",&lt;thead onclick="",&lt;thead ondblclick="",&lt;thead onmousedown="",&lt;thead onmouseup="",&lt;thead onmouseover="",&lt;thead onmousemove="",&lt;thead onmouseout="",&lt;thead onkeypress="",&lt;thead onkeydown="",&lt;thead onkeyup="",&lt;th width="",&lt;th height="",&lt;th colspan="",&lt;th rowspan="",&lt;th align="",&lt;th valign="",&lt;th nowrap="",&lt;th bordercolor="#CCCCCC",&lt;th bordercolorlight="",&lt;th bordercolordark="",&lt;th background="",&lt;th bgcolor="",&lt;th class="",&lt;th id="",&lt;th style="",&lt;th title="",&lt;th axis="",&lt;th headers="",&lt;th scope="",&lt;th abbr="",&lt;th dir="",&lt;th lang="",&lt;th onclick="",&lt;th ondblclick="",&lt;th onmousedown="",&lt;th onmouseup="",&lt;th onmouseover="",&lt;th onmousemove="",&lt;th onmouseout="",&lt;th onkeypress="",&lt;th onkeydown="",&lt;th onkeyup="",&lt;tfoot align="",&lt;tfoot valign="",&lt;tfoot bgcolor="",&lt;tfoot class="",&lt;tfoot id="",&lt;tfoot style="",&lt;tfoot title="",&lt;tfoot dir="",&lt;tfoot lang="",&lt;tfoot onclick="",&lt;tfoot ondblclick="",&lt;tfoot onmousedown="",&lt;tfoot onmouseup="",&lt;tfoot onmouseover="",&lt;tfoot onmousemove="",&lt;tfoot onmouseout="",&lt;tfoot onkeypress="",&lt;tfoot onkeydown="",&lt;tfoot onkeyup="",&lt;textarea name="",&lt;textarea cols="",&lt;textarea rows="",&lt;textarea disabled="disabled",&lt;textarea readonly="readonly",&lt;textarea wrap="",&lt;textarea class="",&lt;textarea id="",&lt;textarea style="",&lt;textarea accesskey="",&lt;textarea tabindex="",&lt;textarea title="",&lt;textarea dir="",&lt;textarea lang="",&lt;textarea onfocus="",&lt;textarea onblur="",&lt;textarea onselect="",&lt;textarea onchange="",&lt;textarea onclick="",&lt;textarea ondblclick="",&lt;textarea onmousedown="",&lt;textarea onmouseup="",&lt;textarea onmouseover="",&lt;textarea onmousemove="",&lt;textarea onmouseout="",&lt;textarea onkeypress="",&lt;textarea onkeydown="",&lt;textarea onkeyup="",&lt;td width="",&lt;td height="",&lt;td colspan="",&lt;td rowspan="",&lt;td align="",&lt;td valign="",&lt;td nowrap="",&lt;td bordercolor="#CCCCCC",&lt;td bordercolorlight="",&lt;td bordercolordark="",&lt;td background="",&lt;td bgcolor="",&lt;td class="",&lt;td id="",&lt;td style="",&lt;td title="",&lt;td axis="",&lt;td headers="",&lt;td scope="",&lt;td abbr="",&lt;td dir="",&lt;td lang="",&lt;td onclick="",&lt;td ondblclick="",&lt;td onmousedown="",&lt;td onmouseup="",&lt;td onmouseover="",&lt;td onmousemove="",&lt;td onmouseout="",&lt;td onkeypress="",&lt;td onkeydown="",&lt;td onkeyup="",&lt;tbody align="",&lt;tbody valign="",&lt;tbody bgcolor="",&lt;tbody class="",&lt;tbody id="",&lt;tbody style="",&lt;tbody title="",&lt;tbody dir="",&lt;tbody lang="",&lt;tbody onclick="",&lt;tbody ondblclick="",&lt;tbody onmousedown="",&lt;tbody onmouseup="",&lt;tbody onmouseover="",&lt;tbody onmousemove="",&lt;tbody onmouseout="",&lt;tbody onkeypress="",&lt;tbody onkeydown="",&lt;tbody onkeyup="",&lt;table width="",&lt;table height="",&lt;table border="",&lt;table align="",&lt;table cellpadding="0",&lt;table cellspacing="0",&lt;table bordercolor="#CCCCCC",&lt;table bordercolorlight="",&lt;table bordercolordark="",&lt;table datapagesize="",&lt;table background="",&lt;table cols="",&lt;table bgcolor="",&lt;table frame="",&lt;table rules="",&lt;table dir="",&lt;table lang="",&lt;table onclick="",&lt;table ondblclick="",&lt;table onmousedown="",&lt;table onmouseup="",&lt;table onmouseover="",&lt;table onmousemove="",&lt;table onmouseout="",&lt;table onkeypress="",&lt;table onkeydown="",&lt;table onkeyup="",&lt;table class="",&lt;table id="",&lt;table style="",&lt;table title="",&lt;table summary="",&lt;sup class="",&lt;sup id="",&lt;sup style="",&lt;sup title="",&lt;sup dir="",&lt;sup lang="",&lt;sup onclick="",&lt;sup ondblclick="",&lt;sup onmousedown="",&lt;sup onmouseup="",&lt;sup onmouseover="",&lt;sup onmousemove="",&lt;sup onmouseout="",&lt;sup onkeypress="",&lt;sup onkeydown="",&lt;sup onkeyup="",&lt;sub class="",&lt;sub id="",&lt;sub style="",&lt;sub title="",&lt;sub dir="",&lt;sub lang="",&lt;sub onclick="",&lt;sub ondblclick="",&lt;sub onmousedown="",&lt;sub onmouseup="",&lt;sub onmouseover="",&lt;sub onmousemove="",&lt;sub onmouseout="",&lt;sub onkeypress="",&lt;sub onkeydown="",&lt;sub onkeyup="",&lt;style type="",&lt;style media="",&lt;style disabled="disabled",&lt;style title="",&lt;strong class="",&lt;strong id="",&lt;strong style="",&lt;strong title="",&lt;strong dir="",&lt;strong lang="",&lt;strong onclick="",&lt;strong ondblclick="",&lt;strong onmousedown="",&lt;strong onmouseup="",&lt;strong onmouseover="",&lt;strong onmousemove="",&lt;strong onmouseout="",&lt;strong onkeypress="",&lt;strong onkeydown="",&lt;strong onkeyup="",&lt;span class="",&lt;span id="",&lt;span style="",&lt;span title="",&lt;span dir="",&lt;span lang="",&lt;span onclick="",&lt;span ondblclick="",&lt;span onmousedown="",&lt;span onmouseup="",&lt;span onmouseover="",&lt;span onmousemove="",&lt;span onmouseout="",&lt;span onkeypress="",&lt;span onkeydown="",&lt;span onkeyup="",&lt;sound src="",&lt;sound loop="",&lt;sound delay="",&lt;small class="",&lt;small id="",&lt;small style="",&lt;small title="",&lt;small dir="",&lt;small lang="",&lt;small onclick="",&lt;small ondblclick="",&lt;small onmousedown="",&lt;small onmouseup="",&lt;small onmouseover="",&lt;small onmousemove="",&lt;small onmouseout="",&lt;small onkeypress="",&lt;small onkeydown="",&lt;small onkeyup="",&lt;select name="",&lt;select size="",&lt;select multiple="",&lt;select disabled="disabled",&lt;select class="",&lt;select id="",&lt;select style="",&lt;select accesskey="",&lt;select tabindex="",&lt;select title="",&lt;select dir="",&lt;select lang="",&lt;select onfocus="",&lt;select onblur="",&lt;select onchange="",&lt;script language="",&lt;script src="",&lt;script type="",&lt;script runat="",&lt;script defer="defer",&lt;samp class="",&lt;samp id="",&lt;samp style="",&lt;samp title="",&lt;samp dir="",&lt;samp lang="",&lt;samp onclick="",&lt;samp ondblclick="",&lt;samp onmousedown="",&lt;samp onmouseup="",&lt;samp onmouseover="",&lt;samp onmousemove="",&lt;samp onmouseout="",&lt;samp onkeypress="",&lt;samp onkeydown="",&lt;samp onkeyup="",&lt;q cite="",&lt;q class="",&lt;q id="",&lt;q style="",&lt;q title="",&lt;q dir="",&lt;q lang="",&lt;q onclick="",&lt;q ondblclick="",&lt;q onmousedown="",&lt;q onmouseup="",&lt;q onmouseover="",&lt;q onmousemove="",&lt;q onmouseout="",&lt;q onkeypress="",&lt;q onkeydown="",&lt;q onkeyup="",&lt;pre class="",&lt;pre id="",&lt;pre style="",&lt;pre title="",&lt;pre dir="",&lt;pre lang="",&lt;pre onclick="",&lt;pre ondblclick="",&lt;pre onmousedown="",&lt;pre onmouseup="",&lt;pre onmouseover="",&lt;pre onmousemove="",&lt;pre onmouseout="",&lt;pre onkeypress="",&lt;pre onkeydown="",&lt;pre onkeyup="",&lt;param name="",&lt;param value="",&lt;param valuetype="",&lt;param type="",&lt;param id="",&lt;p align="",&lt;p class="",&lt;p id="",&lt;p style="",&lt;p title="",&lt;p dir="",&lt;p lang="",&lt;p onclick="",&lt;p ondblclick="",&lt;p onmousedown="",&lt;p onmouseup="",&lt;p onmouseover="",&lt;p onmousemove="",&lt;p onmouseout="",&lt;p onkeypress="",&lt;p onkeydown="",&lt;p onkeyup="",&lt;option value="",&lt;option selected="",&lt;option disabled="disabled",&lt;option class="",&lt;option id="",&lt;option style="",&lt;option title="",&lt;option label="",&lt;option dir="",&lt;option lang="",&lt;option onfocus="",&lt;option onblur="",&lt;option onchange="",&lt;option onclick="",&lt;option ondblclick="",&lt;option onmousedown="",&lt;option onmouseup="",&lt;option onmouseover="",&lt;option onmousemove="",&lt;option onmouseout="",&lt;option onkeypress="",&lt;option onkeydown="",&lt;option onkeyup="",&lt;optgroup label="",&lt;optgroup disabled="disabled",&lt;optgroup class="",&lt;optgroup id="",&lt;optgroup style="",&lt;optgroup title="",&lt;optgroup dir="",&lt;optgroup lang="",&lt;optgroup onfocus="",&lt;optgroup onblur="",&lt;optgroup onchange="",&lt;optgroup onclick="",&lt;optgroup ondblclick="",&lt;optgroup onmousedown="",&lt;optgroup onmouseup="",&lt;optgroup onmouseover="",&lt;optgroup onmousemove="",&lt;optgroup onmouseout="",&lt;optgroup onkeypress="",&lt;optgroup onkeydown="",&lt;optgroup onkeyup="",&lt;ol start="",&lt;ol type="",&lt;ol compact="",&lt;ol class="",&lt;ol id="",&lt;ol style="",&lt;ol title="",&lt;ol dir="",&lt;ol lang="",&lt;ol onclick="",&lt;ol ondblclick="",&lt;ol onmousedown="",&lt;ol onmouseup="",&lt;ol onmouseover="",&lt;ol onmousemove="",&lt;ol onmouseout="",&lt;ol onkeypress="",&lt;ol onkeydown="",&lt;ol onkeyup="",&lt;object noexternaldata="",&lt;object classid="",&lt;object codebase="",&lt;object codetype="",&lt;object data="",&lt;object type="",&lt;object archive="",&lt;object declare="",&lt;object name="",&lt;object width="",&lt;object height="",&lt;object hspace="",&lt;object vspace="",&lt;object align="",&lt;object border="",&lt;object standby="",&lt;object class="",&lt;object id="",&lt;object style="",&lt;object accesskey="",&lt;object tabindex="",&lt;object title="",&lt;object usemap="",&lt;object dir="",&lt;object lang="",&lt;object onclick="",&lt;object ondblclick="",&lt;object onmousedown="",&lt;object onmouseup="",&lt;object onmouseover="",&lt;object onmousemove="",&lt;object onmouseout="",&lt;object onkeypress="",&lt;object onkeydown="",&lt;object onkeyup="",&lt;noscript class="",&lt;noscript id="",&lt;noscript style="",&lt;noscript title="",&lt;noframes class="",&lt;noframes id="",&lt;noframes style="",&lt;noframes title="",&lt;multicol cols="",&lt;multicol width="",&lt;multicol gutter="",&lt;meta name="",&lt;meta http-equiv="",&lt;meta content="",&lt;marquee behavior="",&lt;marquee align="",&lt;marquee direction="",&lt;marquee bgcolor="",&lt;marquee width="",&lt;marquee hspace="",&lt;marquee height="",&lt;marquee vspace="",&lt;marquee loop="",&lt;marquee scrollamount="",&lt;marquee scrolldelay="",&lt;marquee truespeed="",&lt;marquee class="",&lt;marquee id="",&lt;marquee style="",&lt;marquee title="",&lt;marquee dir="",&lt;marquee lang="",&lt;marquee onclick="",&lt;marquee ondblclick="",&lt;marquee onmousedown="",&lt;marquee onmouseup="",&lt;marquee onmouseover="",&lt;marquee onmousemove="",&lt;marquee onmouseout="",&lt;marquee onkeypress="",&lt;marquee onkeydown="",&lt;marquee onkeyup="",&lt;A HREF="",&lt;A NAME="",&lt;A TITLE="",&lt;A TARGET="",&lt;A CHARSET="",&lt;A CLASS="",&lt;A ID="",&lt;A STYLE="",&lt;A HREFLANG="",&lt;A ACCESSKEY="",&lt;A TABINDEX="",&lt;A REL="",&lt;A REV="",&lt;A SHAPE="",&lt;A COORDS="",&lt;A DIR="",&lt;A LANG="",&lt;A onFocus="",&lt;A onBlur="",&lt;A onClick="",&lt;A onDblClick="",&lt;A onMouseDown="",&lt;A onMouseUp="",&lt;A onMouseOver="",&lt;A onMouseMove="",&lt;A onMouseOut="",&lt;A onKeyPress="",&lt;A onKeyDown="",&lt;A onKeyUp="",&lt;ABBR CLASS="",&lt;ABBR ID="",&lt;ABBR STYLE="",&lt;ABBR TITLE="",&lt;ABBR DIR="",&lt;ABBR LANG="",&lt;ABBR onClick="",&lt;ABBR onDblClick="",&lt;ABBR onMouseDown="",&lt;ABBR onMouseUp="",&lt;ABBR onMouseOver="",&lt;ABBR onMouseMove="",&lt;ABBR onMouseOut="",&lt;ABBR onKeyPress="",&lt;ABBR onKeyDown="",&lt;ABBR onKeyUp="",&lt;ACRONYM CLASS="",&lt;ACRONYM ID="",&lt;ACRONYM STYLE="",&lt;ACRONYM TITLE="",&lt;ACRONYM DIR="",&lt;ACRONYM LANG="",&lt;ACRONYM onClick="",&lt;ACRONYM onDblClick="",&lt;ACRONYM onMouseDown="",&lt;ACRONYM onMouseUp="",&lt;ACRONYM onMouseOver="",&lt;ACRONYM onMouseMove="",&lt;ACRONYM onMouseOut="",&lt;ACRONYM onKeyPress="",&lt;ACRONYM onKeyDown="",&lt;ACRONYM onKeyUp="",&lt;ADDRESS CLASS="",&lt;ADDRESS ID="",&lt;ADDRESS STYLE="",&lt;ADDRESS TITLE="",&lt;ADDRESS DIR="",&lt;ADDRESS LANG="",&lt;ADDRESS onClick="",&lt;ADDRESS onDblClick="",&lt;ADDRESS onMouseDown="",&lt;ADDRESS onMouseUp="",&lt;ADDRESS onMouseOver="",&lt;ADDRESS onMouseMove="",&lt;ADDRESS onMouseOut="",&lt;ADDRESS onKeyPress="",&lt;ADDRESS onKeyDown="",&lt;ADDRESS onKeyUp="",&lt;APPLET NOEXTERNALDATA="",&lt;APPLET CODE="",&lt;APPLET CODEBASE="",&lt;APPLET NAME="",&lt;APPLET ALT="",&lt;APPLET WIDTH="",&lt;APPLET HEIGHT="",&lt;APPLET HSPACE="",&lt;APPLET VSPACE="",&lt;APPLET ALIGN="",&lt;APPLET CABBASE="",&lt;APPLET MAYSCRIPT="",&lt;APPLET ARCHIVE="",&lt;APPLET CLASS="",&lt;APPLET ID="",&lt;APPLET STYLE="",&lt;AREA NAME="",&lt;AREA VALUE="",&lt;AREA SHAPE="",&lt;AREA COORDS="",&lt;AREA HREF="",&lt;AREA TARGET="",&lt;AREA ALT="",&lt;AREA DISABLED="DISABLED",&lt;AREA CLASS="",&lt;AREA ID="",&lt;AREA STYLE="",&lt;AREA ACCESSKEY="",&lt;AREA TABINDEX="",&lt;AREA TITLE="",&lt;AREA DIR="",&lt;AREA LANG="",&lt;AREA onFocus="",&lt;AREA onBlur="",&lt;AREA onClick="",&lt;AREA onDblClick="",&lt;AREA onMouseDown="",&lt;AREA onMouseUp="",&lt;AREA onMouseOver="",&lt;AREA onMouseMove="",&lt;AREA onMouseOut="",&lt;AREA onKeyPress="",&lt;AREA onKeyDown="",&lt;AREA onKeyUp="",&lt;B CLASS="",&lt;B ID="",&lt;B STYLE="",&lt;B TITLE="",&lt;B DIR="",&lt;B LANG="",&lt;B onClick="",&lt;B onDblClick="",&lt;B onMouseDown="",&lt;B onMouseUp="",&lt;B onMouseOver="",&lt;B onMouseMove="",&lt;B onMouseOut="",&lt;B onKeyPress="",&lt;B onKeyDown="",&lt;B onKeyUp="",&lt;BASE HREF="",&lt;BASE TARGET="",&lt;BASEFONT SIZE="",&lt;BASEFONT FACE="",&lt;BASEFONT COLOR="",&lt;BASEFONT ID="",&lt;BDO DIR="",&lt;BDO LANG="",&lt;BDO CLASS="",&lt;BDO ID="",&lt;BDO STYLE="",&lt;BDO TITLE="",&lt;BGSOUND SRC="",&lt;BGSOUND LOOP="",&lt;BGSOUND BALANCE="",&lt;BGSOUND VOLUME="",&lt;BGSOUND DELAY="",&lt;BIG CLASS="",&lt;BIG ID="",&lt;BIG STYLE="",&lt;BIG TITLE="",&lt;BIG DIR="",&lt;BIG LANG="",&lt;BIG onClick="",&lt;BIG onDblClick="",&lt;BIG onMouseDown="",&lt;BIG onMouseUp="",&lt;BIG onMouseOver="",&lt;BIG onMouseMove="",&lt;BIG onMouseOut="",&lt;BIG onKeyPress="",&lt;BIG onKeyDown="",&lt;BIG onKeyUp="",&lt;BLOCKQUOTE CITE="",&lt;BLOCKQUOTE CLASS="",&lt;BLOCKQUOTE ID="",&lt;BLOCKQUOTE STYLE="",&lt;BLOCKQUOTE TITLE="",&lt;BLOCKQUOTE DIR="",&lt;BLOCKQUOTE LANG="",&lt;BLOCKQUOTE onClick="",&lt;BLOCKQUOTE onDblClick="",&lt;BLOCKQUOTE onMouseDown="",&lt;BLOCKQUOTE onMouseUp="",&lt;BLOCKQUOTE onMouseOver="",&lt;BLOCKQUOTE onMouseMove="",&lt;BLOCKQUOTE onMouseOut="",&lt;BLOCKQUOTE onKeyPress="",&lt;BLOCKQUOTE onKeyDown="",&lt;BLOCKQUOTE onKeyUp="",&lt;BODY BGCOLOR="",&lt;BODY BACKGROUND="",&lt;BODY TEXT="",&lt;BODY LINK="",&lt;BODY VLINK="",&lt;BODY ALINK="",&lt;BODY LEFTMARGIN="",&lt;BODY TOPMARGIN="",&lt;BODY BGPROPERTIES="",&lt;BODY RIGHTMARGIN="",&lt;BODY BOTTOMMARGIN="",&lt;BODY MARGINWIDTH="",&lt;BODY MARGINHEIGHT="",&lt;BODY CLASS="",&lt;BODY ID="",&lt;BODY STYLE="",&lt;BODY TITLE="",&lt;BODY DIR="",&lt;BODY LANG="",&lt;BODY onLoad="",&lt;BODY onUnload="",&lt;BODY onBlur="",&lt;BODY onError="",&lt;BODY onFocus="",&lt;BODY onResize="",&lt;BR CLEAR="",&lt;BR CLASS="",&lt;BR ID="",&lt;BR STYLE="",&lt;BR TITLE="",&lt;BUTTON NAME="",&lt;BUTTON VALUE="",&lt;BUTTON TYPE="",&lt;BUTTON DISABLED="DISABLED",&lt;BUTTON CLASS="",&lt;BUTTON ID="",&lt;BUTTON STYLE="",&lt;BUTTON ACCESSKEY="",&lt;BUTTON TABINDEX="",&lt;BUTTON TITLE="",&lt;BUTTON DIR="",&lt;BUTTON LANG="",&lt;BUTTON onFocus="",&lt;BUTTON onBlur="",&lt;BUTTON onClick="",&lt;BUTTON onDblClick="",&lt;BUTTON onMouseDown="",&lt;BUTTON onMouseUp="",&lt;BUTTON onMouseOver="",&lt;BUTTON onMouseMove="",&lt;BUTTON onMouseOut="",&lt;BUTTON onKeyPress="",&lt;BUTTON onKeyDown="",&lt;BUTTON onKeyUp="",&lt;CAPTION ALIGN="",&lt;CAPTION VALIGN="",&lt;CAPTION CLASS="",&lt;CAPTION ID="",&lt;CAPTION STYLE="",&lt;CAPTION TITLE="",&lt;CAPTION DIR="",&lt;CAPTION LANG="",&lt;CAPTION onClick="",&lt;CAPTION onDblClick="",&lt;CAPTION onMouseDown="",&lt;CAPTION onMouseUp="",&lt;CAPTION onMouseOver="",&lt;CAPTION onMouseMove="",&lt;CAPTION onMouseOut="",&lt;CAPTION onKeyPress="",&lt;CAPTION onKeyDown="",&lt;CAPTION onKeyUp="",&lt;CITE CLASS="",&lt;CITE ID="",&lt;CITE STYLE="",&lt;CITE TITLE="",&lt;CITE DIR="",&lt;CITE LANG="",&lt;CITE onClick="",&lt;CITE onDblClick="",&lt;CITE onMouseDown="",&lt;CITE onMouseUp="",&lt;CITE onMouseOver="",&lt;CITE onMouseMove="",&lt;CITE onMouseOut="",&lt;CITE onKeyPress="",&lt;CITE onKeyDown="",&lt;CITE onKeyUp="",&lt;CODE CLASS="",&lt;CODE ID="",&lt;CODE STYLE="",&lt;CODE TITLE="",&lt;CODE DIR="",&lt;CODE LANG="",&lt;CODE onClick="",&lt;CODE onDblClick="",&lt;CODE onMouseDown="",&lt;CODE onMouseUp="",&lt;CODE onMouseOver="",&lt;CODE onMouseMove="",&lt;CODE onMouseOut="",&lt;CODE onKeyPress="",&lt;CODE onKeyDown="",&lt;CODE onKeyUp="",&lt;COL ALIGN="",&lt;COL VALIGN="",&lt;COL SPAN="",&lt;COL WIDTH="",&lt;COL CLASS="",&lt;COL ID="",&lt;COL STYLE="",&lt;COL TITLE="",&lt;COL DIR="",&lt;COL LANG="",&lt;COL onClick="",&lt;COL onDblClick="",&lt;COL onMouseDown="",&lt;COL onMouseUp="",&lt;COL onMouseOver="",&lt;COL onMouseMove="",&lt;COL onMouseOut="",&lt;COL onKeyPress="",&lt;COL onKeyDown="",&lt;COL onKeyUp="",&lt;COLGROUP ALIGN="",&lt;COLGROUP VALIGN="",&lt;COLGROUP SPAN="",&lt;COLGROUP WIDTH="",&lt;COLGROUP CLASS="",&lt;COLGROUP ID="",&lt;COLGROUP STYLE="",&lt;COLGROUP TITLE="",&lt;COLGROUP DIR="",&lt;COLGROUP LANG="",&lt;COLGROUP onClick="",&lt;COLGROUP onDblClick="",&lt;COLGROUP onMouseDown="",&lt;COLGROUP onMouseUp="",&lt;COLGROUP onMouseOver="",&lt;COLGROUP onMouseMove="",&lt;COLGROUP onMouseOut="",&lt;COLGROUP onKeyPress="",&lt;COLGROUP onKeyDown="",&lt;COLGROUP onKeyUp="",&lt;DD CLASS="",&lt;DD ID="",&lt;DD STYLE="",&lt;DD TITLE="",&lt;DD DIR="",&lt;DD LANG="",&lt;DD onClick="",&lt;DD onDblClick="",&lt;DD onMouseDown="",&lt;DD onMouseUp="",&lt;DD onMouseOver="",&lt;DD onMouseMove="",&lt;DD onMouseOut="",&lt;DD onKeyPress="",&lt;DD onKeyDown="",&lt;DD onKeyUp="",&lt;DEL CITE="",&lt;DEL DATETIME="",&lt;DEL CLASS="",&lt;DEL ID="",&lt;DEL STYLE="",&lt;DEL TITLE="",&lt;DEL DIR="",&lt;DEL LANG="",&lt;DEL onClick="",&lt;DEL onDblClick="",&lt;DEL onMouseDown="",&lt;DEL onMouseUp="",&lt;DEL onMouseOver="",&lt;DEL onMouseMove="",&lt;DEL onMouseOut="",&lt;DEL onKeyPress="",&lt;DEL onKeyDown="",&lt;DEL onKeyUp="",&lt;DFN CLASS="",&lt;DFN ID="",&lt;DFN STYLE="",&lt;DFN TITLE="",&lt;DFN DIR="",&lt;DFN LANG="",&lt;DFN onClick="",&lt;DFN onDblClick="",&lt;DFN onMouseDown="",&lt;DFN onMouseUp="",&lt;DFN onMouseOver="",&lt;DFN onMouseMove="",&lt;DFN onMouseOut="",&lt;DFN onKeyPress="",&lt;DFN onKeyDown="",&lt;DFN onKeyUp="",&lt;DIV ALIGN="",&lt;DIV CLASS="",&lt;DIV ID="",&lt;DIV STYLE="",&lt;DIV TITLE="",&lt;DIV DIR="",&lt;DIV LANG="",&lt;DIV onClick="",&lt;DIV onDblClick="",&lt;DIV onMouseDown="",&lt;DIV onMouseUp="",&lt;DIV onMouseOver="",&lt;DIV onMouseMove="",&lt;DIV onMouseOut="",&lt;DIV onKeyPress="",&lt;DIV onKeyDown="",&lt;DIV onKeyUp="",&lt;DL COMPACT="",&lt;DL CLASS="",&lt;DL ID="",&lt;DL STYLE="",&lt;DL TITLE="",&lt;DL DIR="",&lt;DL LANG="",&lt;DL onClick="",&lt;DL onDblClick="",&lt;DL onMouseDown="",&lt;DL onMouseUp="",&lt;DL onMouseOver="",&lt;DL onMouseMove="",&lt;DL onMouseOut="",&lt;DL onKeyPress="",&lt;DL onKeyDown="",&lt;DL onKeyUp="",&lt;DT CLASS="",&lt;DT ID="",&lt;DT STYLE="",&lt;DT TITLE="",&lt;DT DIR="",&lt;DT LANG="",&lt;DT onClick="",&lt;DT onDblClick="",&lt;DT onMouseDown="",&lt;DT onMouseUp="",&lt;DT onMouseOver="",&lt;DT onMouseMove="",&lt;DT onMouseOut="",&lt;DT onKeyPress="",&lt;DT onKeyDown="",&lt;DT onKeyUp="",&lt;EM CLASS="",&lt;EM ID="",&lt;EM STYLE="",&lt;EM TITLE="",&lt;EM DIR="",&lt;EM LANG="",&lt;EM onClick="",&lt;EM onDblClick="",&lt;EM onMouseDown="",&lt;EM onMouseUp="",&lt;EM onMouseOver="",&lt;EM onMouseMove="",&lt;EM onMouseOut="",&lt;EM onKeyPress="",&lt;EM onKeyDown="",&lt;EM onKeyUp="",&lt;EMBED SRC="",&lt;EMBED WIDTH="",&lt;EMBED HEIGHT="",&lt;EMBED HSPACE="",&lt;EMBED VSPACE="",&lt;EMBED HIDDEN="",&lt;EMBED AUTOSTART="",&lt;EMBED LOOP="",&lt;EMBED ALIGN="",&lt;EMBED CLASS="",&lt;EMBED STYLE="",&lt;EMBED DIR="",&lt;EMBED LANG="",&lt;FIELDSET CLASS="",&lt;FIELDSET ID="",&lt;FIELDSET STYLE="",&lt;FIELDSET TITLE="",&lt;FIELDSET ACCESSKEY="",&lt;FIELDSET DIR="",&lt;FIELDSET LANG="",&lt;FIELDSET onClick="",&lt;FIELDSET onDblClick="",&lt;FIELDSET onMouseDown="",&lt;FIELDSET onMouseUp="",&lt;FIELDSET onMouseOver="",&lt;FIELDSET onMouseMove="",&lt;FIELDSET onMouseOut="",&lt;FIELDSET onKeyPress="",&lt;FIELDSET onKeyDown="",&lt;FIELDSET onKeyUp="",&lt;FONT COLOR="",&lt;FONT SIZE="",&lt;FONT FACE="",&lt;FONT POINTSIZE="",&lt;FONT CLASS="",&lt;FONT ID="",&lt;FONT STYLE="",&lt;FONT TITLE="",&lt;FONT DIR="",&lt;FONT LANG="",&lt;FORM ACTION="",&lt;FORM METHOD="",&lt;FORM ENCTYPE="",&lt;FORM NAME="",&lt;FORM TARGET="",&lt;FORM CLASS="",&lt;FORM ID="",&lt;FORM STYLE="",&lt;FORM TITLE="",&lt;FORM DIR="",&lt;FORM LANG="",&lt;FORM runat="",&lt;FORM onSubmit="",&lt;FORM onReset="",&lt;FORM onClick="",&lt;FORM onDblClick="",&lt;FORM onMouseDown="",&lt;FORM onMouseUp="",&lt;FORM onMouseOver="",&lt;FORM onMouseMove="",&lt;FORM onMouseOut="",&lt;FORM onKeyPress="",&lt;FORM onKeyDown="",&lt;FORM onKeyUp="",&lt;FRAME SRC="",&lt;FRAME NAME="",&lt;FRAME FRAMEBORDER="",&lt;FRAME SCROLLING="",&lt;FRAME NORESIZE="",&lt;FRAME MARGINWIDTH="",&lt;FRAME MARGINHEIGHT="",&lt;FRAME BORDERCOLOR="",&lt;FRAME CLASS="",&lt;FRAME ID="",&lt;FRAME STYLE="",&lt;FRAME TITLE="",&lt;FRAME LONGDESC="",&lt;FRAMESET ROWS="",&lt;FRAMESET COLS="",&lt;FRAMESET FRAMESPACING="",&lt;FRAMESET FRAMEBORDER="",&lt;FRAMESET BORDER="",&lt;FRAMESET BORDERCOLOR="",&lt;FRAMESET CLASS="",&lt;FRAMESET ID="",&lt;FRAMESET STYLE="",&lt;FRAMESET TITLE="",&lt;FRAMESET onLoad="",&lt;FRAMESET onUnload="",&lt;H1 ALIGN="",&lt;H1 CLASS="",&lt;H1 ID="",&lt;H1 STYLE="",&lt;H1 TITLE="",&lt;H1 DIR="",&lt;H1 LANG="",&lt;H1 onClick="",&lt;H1 onDblClick="",&lt;H1 onMouseDown="",&lt;H1 onMouseUp="",&lt;H1 onMouseOver="",&lt;H1 onMouseMove="",&lt;H1 onMouseOut="",&lt;H1 onKeyPress="",&lt;H1 onKeyDown="",&lt;H1 onKeyUp="",&lt;H2 ALIGN="",&lt;H2 CLASS="",&lt;H2 ID="",&lt;H2 STYLE="",&lt;H2 TITLE="",&lt;H2 DIR="",&lt;H2 LANG="",&lt;H2 onClick="",&lt;H2 onDblClick="",&lt;H2 onMouseDown="",&lt;H2 onMouseUp="",&lt;H2 onMouseOver="",&lt;H2 onMouseMove="",&lt;H2 onMouseOut="",&lt;H2 onKeyPress="",&lt;H2 onKeyDown="",&lt;H2 onKeyUp="",&lt;H3 ALIGN="",&lt;H3 CLASS="",&lt;H3 ID="",&lt;H3 STYLE="",&lt;H3 TITLE="",&lt;H3 DIR="",&lt;H3 LANG="",&lt;H3 onClick="",&lt;H3 onDblClick="",&lt;H3 onMouseDown="",&lt;H3 onMouseUp="",&lt;H3 onMouseOver="",&lt;H3 onMouseMove="",&lt;H3 onMouseOut="",&lt;H3 onKeyPress="",&lt;H3 onKeyDown="",&lt;H3 onKeyUp="",&lt;H4 ALIGN="",&lt;H4 CLASS="",&lt;H4 ID="",&lt;H4 STYLE="",&lt;H4 TITLE="",&lt;H4 DIR="",&lt;H4 LANG="",&lt;H4 onClick="",&lt;H4 onDblClick="",&lt;H4 onMouseDown="",&lt;H4 onMouseUp="",&lt;H4 onMouseOver="",&lt;H4 onMouseMove="",&lt;H4 onMouseOut="",&lt;H4 onKeyPress="",&lt;H4 onKeyDown="",&lt;H4 onKeyUp="",&lt;H5 ALIGN="",&lt;H5 CLASS="",&lt;H5 ID="",&lt;H5 STYLE="",&lt;H5 TITLE="",&lt;H5 DIR="",&lt;H5 LANG="",&lt;H5 onClick="",&lt;H5 onDblClick="",&lt;H5 onMouseDown="",&lt;H5 onMouseUp="",&lt;H5 onMouseOver="",&lt;H5 onMouseMove="",&lt;H5 onMouseOut="",&lt;H5 onKeyPress="",&lt;H5 onKeyDown="",&lt;H5 onKeyUp="",&lt;H6 ALIGN="",&lt;H6 CLASS="",&lt;H6 ID="",&lt;H6 STYLE="",&lt;H6 TITLE="",&lt;H6 DIR="",&lt;H6 LANG="",&lt;H6 onClick="",&lt;H6 onDblClick="",&lt;H6 onMouseDown="",&lt;H6 onMouseUp="",&lt;H6 onMouseOver="",&lt;H6 onMouseMove="",&lt;H6 onMouseOut="",&lt;H6 onKeyPress="",&lt;H6 onKeyDown="",&lt;H6 onKeyUp="",&lt;HR ALIGN="",&lt;HR WIDTH="",&lt;HR SIZE="",&lt;HR NOSHADE="",&lt;HR COLOR="",&lt;HR CLASS="",&lt;HR ID="",&lt;HR STYLE="",&lt;HR TITLE="",&lt;HR onClick="",&lt;HR onDblClick="",&lt;HR onMouseDown="",&lt;HR onMouseUp="",&lt;HR onMouseOver="",&lt;HR onMouseMove="",&lt;HR onMouseOut="",&lt;HR onKeyPress="",&lt;HR onKeyDown="",&lt;HR onKeyUp="",&lt;HTML xmlns="",&lt;HTML xml:lang="",&lt;HTML lang="",&lt;HTML dir="",&lt;I CLASS="",&lt;I ID="",&lt;I STYLE="",&lt;I TITLE="",&lt;I DIR="",&lt;I LANG="",&lt;I onClick="",&lt;I onDblClick="",&lt;I onMouseDown="",&lt;I onMouseUp="",&lt;I onMouseOver="",&lt;I onMouseMove="",&lt;I onMouseOut="",&lt;I onKeyPress="",&lt;I onKeyDown="",&lt;I onKeyUp="",&lt;IFRAME SRC="",&lt;IFRAME NAME="",&lt;IFRAME WIDTH="",&lt;IFRAME MARGINWIDTH="",&lt;IFRAME HEIGHT="",&lt;IFRAME MARGINHEIGHT="",&lt;IFRAME ALIGN="",&lt;IFRAME SCROLLING="",&lt;IFRAME FRAMEBORDER="",&lt;IFRAME HSPACE="",&lt;IFRAME VSPACE="",&lt;IFRAME CLASS="",&lt;IFRAME ID="",&lt;IFRAME STYLE="",&lt;IFRAME TITLE="",&lt;IFRAME LONGDESC="",&lt;ILAYER NAME="",&lt;ILAYER ID="",&lt;ILAYER LEFT="",&lt;ILAYER TOP="",&lt;ILAYER PAGEX="",&lt;ILAYER PAGEY="",&lt;ILAYER ABOVE="",&lt;ILAYER BELOW="",&lt;ILAYER Z-INDEX="",&lt;ILAYER WIDTH="",&lt;ILAYER HEIGHT="",&lt;ILAYER VISIBILITY="",&lt;ILAYER CLIP="",&lt;ILAYER BGCOLOR="",&lt;ILAYER BACKGROUND="",&lt;ILAYER SRC="",&lt;ILAYER onFocus="",&lt;ILAYER onBlur="",&lt;ILAYER onLoad="",&lt;ILAYER onMouseOver="",&lt;ILAYER onMouseOut="",&lt;IMG SRC="",&lt;IMG ALT="",&lt;IMG NAME="",&lt;IMG WIDTH="",&lt;IMG HEIGHT="",&lt;IMG HSPACE="",&lt;IMG VSPACE="",&lt;IMG BORDER="",&lt;IMG ALIGN="",&lt;IMG USEMAP="",&lt;IMG ISMAP="ISMAP",&lt;IMG DYNSRC="",&lt;IMG CONTROLS="",&lt;IMG START="",&lt;IMG LOOP="",&lt;IMG LOWSRC="",&lt;IMG CLASS="",&lt;IMG ID="",&lt;IMG STYLE="",&lt;IMG TITLE="",&lt;IMG LONGDESC="",&lt;IMG DIR="",&lt;IMG LANG="",&lt;IMG onClick="",&lt;IMG onDblClick="",&lt;IMG onMouseDown="",&lt;IMG onMouseUp="",&lt;IMG onMouseOver="",&lt;IMG onMouseMove="",&lt;IMG onMouseOut="",&lt;IMG onKeyPress="",&lt;IMG onKeyDown="",&lt;IMG onKeyUp="",&lt;INPUT NAME="",&lt;INPUT TYPE="",&lt;INPUT DISABLED="DISABLED",&lt;INPUT CLASS="",&lt;INPUT ID="",&lt;INPUT STYLE="",&lt;INPUT ACCESSKEY="",&lt;INPUT TABINDEX="",&lt;INPUT TITLE="",&lt;INPUT DIR="",&lt;INPUT LANG="",&lt;INPUT onFocus="",&lt;INPUT onBlur="",&lt;INPUT onSelect="",&lt;INPUT onChange="",&lt;INPUT onClick="",&lt;INPUT onDblClick="",&lt;INPUT onMouseDown="",&lt;INPUT onMouseUp="",&lt;INPUT onMouseOver="",&lt;INPUT onMouseMove="",&lt;INPUT onMouseOut="",&lt;INPUT onKeyPress="",&lt;INPUT onKeyDown="",&lt;INPUT onKeyUp="",&lt;INPUT VALUE="",&lt;INPUT SIZE="",&lt;INPUT MAXLENGTH="",&lt;INPUT READONLY="READONLY",&lt;INPUT CHECKED="CHECKED",&lt;INPUT SRC="",&lt;INPUT ALT="",&lt;INPUT ALIGN="",&lt;INPUT USEMAP="",&lt;INPUT WIDTH="",&lt;INPUT HEIGHT="",&lt;INPUT HSPACE="",&lt;INPUT VSPACE="",&lt;INPUT BORDER="",&lt;INPUT ACCEPT="",&lt;INS CITE="",&lt;INS DATETIME="",&lt;INS CLASS="",&lt;INS ID="",&lt;INS STYLE="",&lt;INS TITLE="",&lt;INS DIR="",&lt;INS LANG="",&lt;INS onClick="",&lt;INS onDblClick="",&lt;INS onMouseDown="",&lt;INS onMouseUp="",&lt;INS onMouseOver="",&lt;INS onMouseMove="",&lt;INS onMouseOut="",&lt;INS onKeyPress="",&lt;INS onKeyDown="",&lt;INS onKeyUp="",&lt;KBD CLASS="",&lt;KBD ID="",&lt;KBD STYLE="",&lt;KBD TITLE="",&lt;KBD DIR="",&lt;KBD LANG="",&lt;KBD onClick="",&lt;KBD onDblClick="",&lt;KBD onMouseDown="",&lt;KBD onMouseUp="",&lt;KBD onMouseOver="",&lt;KBD onMouseMove="",&lt;KBD onMouseOut="",&lt;KBD onKeyPress="",&lt;KBD onKeyDown="",&lt;KBD onKeyUp="",&lt;LABEL FOR="",&lt;LABEL CLASS="",&lt;LABEL ID="",&lt;LABEL STYLE="",&lt;LABEL ACCESSKEY="",&lt;LABEL TITLE="",&lt;LABEL DIR="",&lt;LABEL LANG="",&lt;LABEL onFocus="",&lt;LABEL onBlur="",&lt;LABEL onClick="",&lt;LABEL onDblClick="",&lt;LABEL onMouseDown="",&lt;LABEL onMouseUp="",&lt;LABEL onMouseOver="",&lt;LABEL onMouseMove="",&lt;LABEL onMouseOut="",&lt;LABEL onKeyPress="",&lt;LABEL onKeyDown="",&lt;LABEL onKeyUp="",&lt;LAYER NAME="",&lt;LAYER LEFT="",&lt;LAYER TOP="",&lt;LAYER PAGEX="",&lt;LAYER PAGEY="",&lt;LAYER ABOVE="",&lt;LAYER BELOW="",&lt;LAYER Z-INDEX="",&lt;LAYER WIDTH="",&lt;LAYER HEIGHT="",&lt;LAYER VISIBILITY="",&lt;LAYER CLIP="",&lt;LAYER BGCOLOR="",&lt;LAYER BACKGROUND="",&lt;LAYER SRC="",&lt;LAYER onFocus="",&lt;LAYER onBlur="",&lt;LAYER onLoad="",&lt;LAYER onMouseOver="",&lt;LAYER onMouseOut="",&lt;LEGEND ALIGN="",&lt;LEGEND CLASS="",&lt;LEGEND ID="",&lt;LEGEND STYLE="",&lt;LEGEND ACCESSKEY="",&lt;LEGEND TITLE="",&lt;LEGEND DIR="",&lt;LEGEND LANG="",&lt;LEGEND onClick="",&lt;LEGEND onDblClick="",&lt;LEGEND onMouseDown="",&lt;LEGEND onMouseUp="",&lt;LEGEND onMouseOver="",&lt;LEGEND onMouseMove="",&lt;LEGEND onMouseOut="",&lt;LEGEND onKeyPress="",&lt;LEGEND onKeyDown="",&lt;LEGEND onKeyUp="",&lt;LI TYPE="",&lt;LI VALUE="",&lt;LI CLASS="",&lt;LI ID="",&lt;LI STYLE="",&lt;LI TITLE="",&lt;LI DIR="",&lt;LI LANG="",&lt;LI onClick="",&lt;LI onDblClick="",&lt;LI onMouseDown="",&lt;LI onMouseUp="",&lt;LI onMouseOver="",&lt;LI onMouseMove="",&lt;LI onMouseOut="",&lt;LI onKeyPress="",&lt;LI onKeyDown="",&lt;LI onKeyUp="",&lt;LINK HREF="",&lt;LINK REL="",&lt;LINK REV="",&lt;LINK TITLE="",&lt;LINK TYPE="",&lt;LINK MEDIA="",&lt;LINK DISABLED="DISABLED",&lt;LINK CLASS="",&lt;LINK ID="",&lt;LINK HREFLANG="",&lt;LINK STYLE="",&lt;MAP NAME="",&lt;MAP CLASS="",&lt;MAP ID="",&lt;MAP STYLE="",&lt;MAP TITLE="",&lt;MAP DIR="",&lt;MAP LANG="",&lt;MAP onFocus="",&lt;MAP onBlur="",&lt;MAP onClick="",&lt;MAP onDblClick="",&lt;MAP onMouseDown="",&lt;MAP onMouseUp="",&lt;MAP onMouseOver="",&lt;MAP onMouseMove="",&lt;MAP onMouseOut="",&lt;MAP onKeyPress="",&lt;MAP onKeyDown="",&lt;MAP onKeyUp="",&lt;VAR CLASS="",&lt;VAR ID="",&lt;VAR STYLE="",&lt;VAR TITLE="",&lt;VAR DIR="",&lt;VAR LANG="",&lt;VAR onClick="",&lt;VAR onDblClick="",&lt;VAR onMouseDown="",&lt;VAR onMouseUp="",&lt;VAR onMouseOver="",&lt;VAR onMouseMove="",&lt;VAR onMouseOut="",&lt;VAR onKeyPress="",&lt;VAR onKeyDown="",&lt;VAR onKeyUp="",&lt;UL TYPE="",&lt;UL COMPACT="",&lt;UL CLASS="",&lt;UL ID="",&lt;UL STYLE="",&lt;UL TITLE="",&lt;UL DIR="",&lt;UL LANG="",&lt;UL onClick="",&lt;UL onDblClick="",&lt;UL onMouseDown="",&lt;UL onMouseUp="",&lt;UL onMouseOver="",&lt;UL onMouseMove="",&lt;UL onMouseOut="",&lt;UL onKeyPress="",&lt;UL onKeyDown="",&lt;UL onKeyUp="",&lt;TT CLASS="",&lt;TT ID="",&lt;TT STYLE="",&lt;TT TITLE="",&lt;TT DIR="",&lt;TT LANG="",&lt;TT onClick="",&lt;TT onDblClick="",&lt;TT onMouseDown="",&lt;TT onMouseUp="",&lt;TT onMouseOver="",&lt;TT onMouseMove="",&lt;TT onMouseOut="",&lt;TT onKeyPress="",&lt;TT onKeyDown="",&lt;TT onKeyUp="",&lt;TR ALIGN="",&lt;TR VALIGN="",&lt;TR BORDERCOLOR="",&lt;TR BORDERCOLORLIGHT="",&lt;TR BORDERCOLORDARK="",&lt;TR NOWRAP="",&lt;TR BGCOLOR="",&lt;TR CLASS="",&lt;TR ID="",&lt;TR STYLE="",&lt;TR TITLE="",&lt;TR DIR="",&lt;TR LANG="",&lt;TR onClick="",&lt;TR onDblClick="",&lt;TR onMouseDown="",&lt;TR onMouseUp="",&lt;TR onMouseOver="",&lt;TR onMouseMove="",&lt;TR onMouseOut="",&lt;TR onKeyPress="",&lt;TR onKeyDown="",&lt;TR onKeyUp="",&lt;THEAD ALIGN="",&lt;THEAD VALIGN="",&lt;THEAD BGCOLOR="",&lt;THEAD CLASS="",&lt;THEAD ID="",&lt;THEAD STYLE="",&lt;THEAD TITLE="",&lt;THEAD DIR="",&lt;THEAD LANG="",&lt;THEAD onClick="",&lt;THEAD onDblClick="",&lt;THEAD onMouseDown="",&lt;THEAD onMouseUp="",&lt;THEAD onMouseOver="",&lt;THEAD onMouseMove="",&lt;THEAD onMouseOut="",&lt;THEAD onKeyPress="",&lt;THEAD onKeyDown="",&lt;THEAD onKeyUp="",&lt;TH WIDTH="",&lt;TH HEIGHT="",&lt;TH COLSPAN="",&lt;TH ROWSPAN="",&lt;TH ALIGN="",&lt;TH VALIGN="",&lt;TH NOWRAP="",&lt;TH BORDERCOLOR="",&lt;TH BORDERCOLORLIGHT="",&lt;TH BORDERCOLORDARK="",&lt;TH BACKGROUND="",&lt;TH BGCOLOR="",&lt;TH CLASS="",&lt;TH ID="",&lt;TH STYLE="",&lt;TH TITLE="",&lt;TH AXIS="",&lt;TH HEADERS="",&lt;TH SCOPE="",&lt;TH ABBR="",&lt;TH DIR="",&lt;TH LANG="",&lt;TH onClick="",&lt;TH onDblClick="",&lt;TH onMouseDown="",&lt;TH onMouseUp="",&lt;TH onMouseOver="",&lt;TH onMouseMove="",&lt;TH onMouseOut="",&lt;TH onKeyPress="",&lt;TH onKeyDown="",&lt;TH onKeyUp="",&lt;TFOOT ALIGN="",&lt;TFOOT VALIGN="",&lt;TFOOT BGCOLOR="",&lt;TFOOT CLASS="",&lt;TFOOT ID="",&lt;TFOOT STYLE="",&lt;TFOOT TITLE="",&lt;TFOOT DIR="",&lt;TFOOT LANG="",&lt;TFOOT onClick="",&lt;TFOOT onDblClick="",&lt;TFOOT onMouseDown="",&lt;TFOOT onMouseUp="",&lt;TFOOT onMouseOver="",&lt;TFOOT onMouseMove="",&lt;TFOOT onMouseOut="",&lt;TFOOT onKeyPress="",&lt;TFOOT onKeyDown="",&lt;TFOOT onKeyUp="",&lt;TEXTAREA NAME="",&lt;TEXTAREA COLS="",&lt;TEXTAREA ROWS="",&lt;TEXTAREA DISABLED="DISABLED",&lt;TEXTAREA READONLY="READONLY",&lt;TEXTAREA WRAP="",&lt;TEXTAREA CLASS="",&lt;TEXTAREA ID="",&lt;TEXTAREA STYLE="",&lt;TEXTAREA ACCESSKEY="",&lt;TEXTAREA TABINDEX="",&lt;TEXTAREA TITLE="",&lt;TEXTAREA DIR="",&lt;TEXTAREA LANG="",&lt;TEXTAREA onFocus="",&lt;TEXTAREA onBlur="",&lt;TEXTAREA onSelect="",&lt;TEXTAREA onChange="",&lt;TEXTAREA onClick="",&lt;TEXTAREA onDblClick="",&lt;TEXTAREA onMouseDown="",&lt;TEXTAREA onMouseUp="",&lt;TEXTAREA onMouseOver="",&lt;TEXTAREA onMouseMove="",&lt;TEXTAREA onMouseOut="",&lt;TEXTAREA onKeyPress="",&lt;TEXTAREA onKeyDown="",&lt;TEXTAREA onKeyUp="",&lt;TD WIDTH="",&lt;TD HEIGHT="",&lt;TD COLSPAN="",&lt;TD ROWSPAN="",&lt;TD ALIGN="",&lt;TD VALIGN="",&lt;TD NOWRAP="",&lt;TD BORDERCOLOR="",&lt;TD BORDERCOLORLIGHT="",&lt;TD BORDERCOLORDARK="",&lt;TD BACKGROUND="",&lt;TD BGCOLOR="",&lt;TD CLASS="",&lt;TD ID="",&lt;TD STYLE="",&lt;TD TITLE="",&lt;TD AXIS="",&lt;TD HEADERS="",&lt;TD SCOPE="",&lt;TD ABBR="",&lt;TD DIR="",&lt;TD LANG="",&lt;TD onClick="",&lt;TD onDblClick="",&lt;TD onMouseDown="",&lt;TD onMouseUp="",&lt;TD onMouseOver="",&lt;TD onMouseMove="",&lt;TD onMouseOut="",&lt;TD onKeyPress="",&lt;TD onKeyDown="",&lt;TD onKeyUp="",&lt;TBODY ALIGN="",&lt;TBODY VALIGN="",&lt;TBODY BGCOLOR="",&lt;TBODY CLASS="",&lt;TBODY ID="",&lt;TBODY STYLE="",&lt;TBODY TITLE="",&lt;TBODY DIR="",&lt;TBODY LANG="",&lt;TBODY onClick="",&lt;TBODY onDblClick="",&lt;TBODY onMouseDown="",&lt;TBODY onMouseUp="",&lt;TBODY onMouseOver="",&lt;TBODY onMouseMove="",&lt;TBODY onMouseOut="",&lt;TBODY onKeyPress="",&lt;TBODY onKeyDown="",&lt;TBODY onKeyUp="",&lt;TABLE WIDTH="",&lt;TABLE HEIGHT="",&lt;TABLE BORDER="",&lt;TABLE ALIGN="",&lt;TABLE CELLPADDING="0",&lt;TABLE CELLSPACING="0",&lt;TABLE BORDERCOLOR="",&lt;TABLE BORDERCOLORLIGHT="",&lt;TABLE BORDERCOLORDARK="",&lt;TABLE DATAPAGESIZE="",&lt;TABLE BACKGROUND="",&lt;TABLE COLS="",&lt;TABLE BGCOLOR="",&lt;TABLE FRAME="",&lt;TABLE RULES="",&lt;TABLE DIR="",&lt;TABLE LANG="",&lt;TABLE onClick="",&lt;TABLE onDblClick="",&lt;TABLE onMouseDown="",&lt;TABLE onMouseUp="",&lt;TABLE onMouseOver="",&lt;TABLE onMouseMove="",&lt;TABLE onMouseOut="",&lt;TABLE onKeyPress="",&lt;TABLE onKeyDown="",&lt;TABLE onKeyUp="",&lt;TABLE CLASS="",&lt;TABLE ID="",&lt;TABLE STYLE="",&lt;TABLE TITLE="",&lt;TABLE SUMMARY="",&lt;SUP CLASS="",&lt;SUP ID="",&lt;SUP STYLE="",&lt;SUP TITLE="",&lt;SUP DIR="",&lt;SUP LANG="",&lt;SUP onClick="",&lt;SUP onDblClick="",&lt;SUP onMouseDown="",&lt;SUP onMouseUp="",&lt;SUP onMouseOver="",&lt;SUP onMouseMove="",&lt;SUP onMouseOut="",&lt;SUP onKeyPress="",&lt;SUP onKeyDown="",&lt;SUP onKeyUp="",&lt;SUB CLASS="",&lt;SUB ID="",&lt;SUB STYLE="",&lt;SUB TITLE="",&lt;SUB DIR="",&lt;SUB LANG="",&lt;SUB onClick="",&lt;SUB onDblClick="",&lt;SUB onMouseDown="",&lt;SUB onMouseUp="",&lt;SUB onMouseOver="",&lt;SUB onMouseMove="",&lt;SUB onMouseOut="",&lt;SUB onKeyPress="",&lt;SUB onKeyDown="",&lt;SUB onKeyUp="",&lt;STYLE TYPE="",&lt;STYLE MEDIA="",&lt;STYLE DISABLED="DISABLED",&lt;STYLE TITLE="",&lt;STRONG CLASS="",&lt;STRONG ID="",&lt;STRONG STYLE="",&lt;STRONG TITLE="",&lt;STRONG DIR="",&lt;STRONG LANG="",&lt;STRONG onClick="",&lt;STRONG onDblClick="",&lt;STRONG onMouseDown="",&lt;STRONG onMouseUp="",&lt;STRONG onMouseOver="",&lt;STRONG onMouseMove="",&lt;STRONG onMouseOut="",&lt;STRONG onKeyPress="",&lt;STRONG onKeyDown="",&lt;STRONG onKeyUp="",&lt;SPAN CLASS="",&lt;SPAN ID="",&lt;SPAN STYLE="",&lt;SPAN TITLE="",&lt;SPAN DIR="",&lt;SPAN LANG="",&lt;SPAN onClick="",&lt;SPAN onDblClick="",&lt;SPAN onMouseDown="",&lt;SPAN onMouseUp="",&lt;SPAN onMouseOver="",&lt;SPAN onMouseMove="",&lt;SPAN onMouseOut="",&lt;SPAN onKeyPress="",&lt;SPAN onKeyDown="",&lt;SPAN onKeyUp="",&lt;SOUND SRC="",&lt;SOUND LOOP="",&lt;SOUND DELAY="",&lt;SMALL CLASS="",&lt;SMALL ID="",&lt;SMALL STYLE="",&lt;SMALL TITLE="",&lt;SMALL DIR="",&lt;SMALL LANG="",&lt;SMALL onClick="",&lt;SMALL onDblClick="",&lt;SMALL onMouseDown="",&lt;SMALL onMouseUp="",&lt;SMALL onMouseOver="",&lt;SMALL onMouseMove="",&lt;SMALL onMouseOut="",&lt;SMALL onKeyPress="",&lt;SMALL onKeyDown="",&lt;SMALL onKeyUp="",&lt;SELECT NAME="",&lt;SELECT SIZE="",&lt;SELECT MULTIPLE="",&lt;SELECT DISABLED="DISABLED",&lt;SELECT CLASS="",&lt;SELECT ID="",&lt;SELECT STYLE="",&lt;SELECT ACCESSKEY="",&lt;SELECT TABINDEX="",&lt;SELECT TITLE="",&lt;SELECT DIR="",&lt;SELECT LANG="",&lt;SELECT onFocus="",&lt;SELECT onBlur="",&lt;SELECT onChange="",&lt;SCRIPT language="",&lt;SCRIPT SRC="",&lt;SCRIPT TYPE="",&lt;SCRIPT runat="",&lt;SCRIPT DEFER="DEFER",&lt;SAMP CLASS="",&lt;SAMP ID="",&lt;SAMP STYLE="",&lt;SAMP TITLE="",&lt;SAMP DIR="",&lt;SAMP LANG="",&lt;SAMP onClick="",&lt;SAMP onDblClick="",&lt;SAMP onMouseDown="",&lt;SAMP onMouseUp="",&lt;SAMP onMouseOver="",&lt;SAMP onMouseMove="",&lt;SAMP onMouseOut="",&lt;SAMP onKeyPress="",&lt;SAMP onKeyDown="",&lt;SAMP onKeyUp="",&lt;Q CITE="",&lt;Q CLASS="",&lt;Q ID="",&lt;Q STYLE="",&lt;Q TITLE="",&lt;Q DIR="",&lt;Q LANG="",&lt;Q onClick="",&lt;Q onDblClick="",&lt;Q onMouseDown="",&lt;Q onMouseUp="",&lt;Q onMouseOver="",&lt;Q onMouseMove="",&lt;Q onMouseOut="",&lt;Q onKeyPress="",&lt;Q onKeyDown="",&lt;Q onKeyUp="",&lt;PRE CLASS="",&lt;PRE ID="",&lt;PRE STYLE="",&lt;PRE TITLE="",&lt;PRE DIR="",&lt;PRE LANG="",&lt;PRE onClick="",&lt;PRE onDblClick="",&lt;PRE onMouseDown="",&lt;PRE onMouseUp="",&lt;PRE onMouseOver="",&lt;PRE onMouseMove="",&lt;PRE onMouseOut="",&lt;PRE onKeyPress="",&lt;PRE onKeyDown="",&lt;PRE onKeyUp="",&lt;PARAM NAME="",&lt;PARAM VALUE="",&lt;PARAM VALUETYPE="",&lt;PARAM TYPE="",&lt;PARAM ID="",&lt;P ALIGN="",&lt;P CLASS="",&lt;P ID="",&lt;P STYLE="",&lt;P TITLE="",&lt;P DIR="",&lt;P LANG="",&lt;P onClick="",&lt;P onDblClick="",&lt;P onMouseDown="",&lt;P onMouseUp="",&lt;P onMouseOver="",&lt;P onMouseMove="",&lt;P onMouseOut="",&lt;P onKeyPress="",&lt;P onKeyDown="",&lt;P onKeyUp="",&lt;OPTION VALUE="",&lt;OPTION SELECTED="",&lt;OPTION DISABLED="DISABLED",&lt;OPTION CLASS="",&lt;OPTION ID="",&lt;OPTION STYLE="",&lt;OPTION TITLE="",&lt;OPTION LABEL="",&lt;OPTION DIR="",&lt;OPTION LANG="",&lt;OPTION onFocus="",&lt;OPTION onBlur="",&lt;OPTION onChange="",&lt;OPTION onClick="",&lt;OPTION onDblClick="",&lt;OPTION onMouseDown="",&lt;OPTION onMouseUp="",&lt;OPTION onMouseOver="",&lt;OPTION onMouseMove="",&lt;OPTION onMouseOut="",&lt;OPTION onKeyPress="",&lt;OPTION onKeyDown="",&lt;OPTION onKeyUp="",&lt;OPTGROUP LABEL="",&lt;OPTGROUP DISABLED="DISABLED",&lt;OPTGROUP CLASS="",&lt;OPTGROUP ID="",&lt;OPTGROUP STYLE="",&lt;OPTGROUP TITLE="",&lt;OPTGROUP DIR="",&lt;OPTGROUP LANG="",&lt;OPTGROUP onFocus="",&lt;OPTGROUP onBlur="",&lt;OPTGROUP onChange="",&lt;OPTGROUP onClick="",&lt;OPTGROUP onDblClick="",&lt;OPTGROUP onMouseDown="",&lt;OPTGROUP onMouseUp="",&lt;OPTGROUP onMouseOver="",&lt;OPTGROUP onMouseMove="",&lt;OPTGROUP onMouseOut="",&lt;OPTGROUP onKeyPress="",&lt;OPTGROUP onKeyDown="",&lt;OPTGROUP onKeyUp="",&lt;OL START="",&lt;OL type="",&lt;OL COMPACT="",&lt;OL CLASS="",&lt;OL ID="",&lt;OL STYLE="",&lt;OL TITLE="",&lt;OL DIR="",&lt;OL LANG="",&lt;OL onClick="",&lt;OL onDblClick="",&lt;OL onMouseDown="",&lt;OL onMouseUp="",&lt;OL onMouseOver="",&lt;OL onMouseMove="",&lt;OL onMouseOut="",&lt;OL onKeyPress="",&lt;OL onKeyDown="",&lt;OL onKeyUp="",&lt;OBJECT NOEXTERNALDATA="",&lt;OBJECT CLASSID="",&lt;OBJECT CODEBASE="",&lt;OBJECT CODETYPE="",&lt;OBJECT DATA="",&lt;OBJECT TYPE="",&lt;OBJECT ARCHIVE="",&lt;OBJECT DECLARE="",&lt;OBJECT NAME="",&lt;OBJECT WIDTH="",&lt;OBJECT HEIGHT="",&lt;OBJECT HSPACE="",&lt;OBJECT VSPACE="",&lt;OBJECT ALIGN="",&lt;OBJECT BORDER="",&lt;OBJECT STANDBY="",&lt;OBJECT CLASS="",&lt;OBJECT ID="",&lt;OBJECT STYLE="",&lt;OBJECT ACCESSKEY="",&lt;OBJECT TABINDEX="",&lt;OBJECT TITLE="",&lt;OBJECT USEMAP="",&lt;OBJECT DIR="",&lt;OBJECT LANG="",&lt;OBJECT onClick="",&lt;OBJECT onDblClick="",&lt;OBJECT onMouseDown="",&lt;OBJECT onMouseUp="",&lt;OBJECT onMouseOver="",&lt;OBJECT onMouseMove="",&lt;OBJECT onMouseOut="",&lt;OBJECT onKeyPress="",&lt;OBJECT onKeyDown="",&lt;OBJECT onKeyUp="",&lt;NOSCRIPT CLASS="",&lt;NOSCRIPT ID="",&lt;NOSCRIPT STYLE="",&lt;NOSCRIPT TITLE="",&lt;NOFRAMES CLASS="",&lt;NOFRAMES ID="",&lt;NOFRAMES STYLE="",&lt;NOFRAMES TITLE="",&lt;MULTICOL COLS="",&lt;MULTICOL WIDTH="",&lt;MULTICOL GUTTER="",&lt;META NAME="",&lt;META HTTP-EQUIV="",&lt;META CONTENT="",&lt;MARQUEE BEHAVIOR="",&lt;MARQUEE ALIGN="",&lt;MARQUEE DIRECTION="",&lt;MARQUEE BGCOLOR="",&lt;MARQUEE WIDTH="",&lt;MARQUEE HSPACE="",&lt;MARQUEE HEIGHT="",&lt;MARQUEE VSPACE="",&lt;MARQUEE LOOP="",&lt;MARQUEE SCROLLAMOUNT="",&lt;MARQUEE SCROLLDELAY="",&lt;MARQUEE TRUESPEED="",&lt;MARQUEE CLASS="",&lt;MARQUEE ID="",&lt;MARQUEE STYLE="",&lt;MARQUEE TITLE="",&lt;MARQUEE DIR="",&lt;MARQUEE LANG="",&lt;MARQUEE onClick="",&lt;MARQUEE onDblClick="",&lt;MARQUEE onMouseDown="",&lt;MARQUEE onMouseUp="",&lt;MARQUEE onMouseOver="",&lt;MARQUEE onMouseMove="",&lt;MARQUEE onMouseOut="",&lt;MARQUEE onKeyPress="",&lt;MARQUEE onKeyDown="",&lt;MARQUEE onKeyUp="",</string>
-			</dict>
-		</array>
-	</dict>
-	<key>uuid</key>
-	<string>69BD9C8F-15C0-4F67-8B7E-64E48B5E9E71</string>
-</dict>
-</plist>
diff --git a/bundles/html.tmbundle/Preferences/Empty tag typing pairs.plist b/bundles/html.tmbundle/Preferences/Empty tag typing pairs.plist
deleted file mode 100644
index e1324da77..000000000
--- a/bundles/html.tmbundle/Preferences/Empty tag typing pairs.plist	
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>name</key>
-	<string>Typing Pairs: Empty Tag</string>
-	<key>scope</key>
-	<string>text.html invalid.illegal.incomplete</string>
-	<key>settings</key>
-	<dict>
-		<key>smartTypingPairs</key>
-		<array>
-			<array>
-				<string>?</string>
-				<string>?</string>
-			</array>
-			<array>
-				<string>%</string>
-				<string>%</string>
-			</array>
-		</array>
-	</dict>
-	<key>uuid</key>
-	<string>6D6B631D-0D6C-413C-B4FA-1D535CBCE890</string>
-</dict>
-</plist>
diff --git a/bundles/html.tmbundle/Preferences/Folding.tmPreferences b/bundles/html.tmbundle/Preferences/Folding.tmPreferences
deleted file mode 100644
index 442944916..000000000
--- a/bundles/html.tmbundle/Preferences/Folding.tmPreferences
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>name</key>
-	<string>Folding</string>
-	<key>scope</key>
-	<string>text.html</string>
-	<key>settings</key>
-	<dict>
-		<key>foldingStartMarker</key>
-		<string>(?x)
-		(&lt;(?i:head|body|table|thead|tbody|tfoot|tr|div|select|fieldset|style|script|ul|ol|li|form|dl|section|article|header|footer|nav|aside)\b.*?&gt;
-		|&lt;!--(?!.*--\s*&gt;)
-		|^&lt;!--\ \#tminclude\ (?&gt;.*?--&gt;)$
-		|&lt;\?(?:php)?.*\b(if|for(each)?|while)\b.+:
-		|\{\{?(if|foreach|capture|literal|foreach|php|section|strip)
-		|\{\s*($|\?&gt;\s*$|//|/\*(.*\*/\s*$|(?!.*?\*/)))
-		|array\s?\(\s*$
-		)</string>
-		<key>foldingStopMarker</key>
-		<string>(?x)
-		(&lt;/(?i:head|body|table|thead|tbody|tfoot|tr|div|select|fieldset|style|script|ul|ol|li|form|dl|section|article|header|footer|nav|aside)&gt;
-		|^(?!.*?&lt;!--).*?--\s*&gt;
-		|^&lt;!--\ end\ tminclude\ --&gt;$
-		|&lt;\?(?:php)?.*\bend(if|for(each)?|while)\b
-		|\{\{?/(if|foreach|capture|literal|foreach|php|section|strip)
-		|^[^{]*\}
-		|^\s*\)[,;]
-		)</string>
-	</dict>
-	<key>uuid</key>
-	<string>559D87E0-20C9-4424-AD7C-F3CDD315177C</string>
-</dict>
-</plist>
diff --git a/bundles/html.tmbundle/Preferences/Indent Corrections.tmPreferences b/bundles/html.tmbundle/Preferences/Indent Corrections.tmPreferences
deleted file mode 100644
index 36e65d0e3..000000000
--- a/bundles/html.tmbundle/Preferences/Indent Corrections.tmPreferences	
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>name</key>
-	<string>Indent Corrections</string>
-	<key>scope</key>
-	<string>text.html</string>
-	<key>settings</key>
-	<dict>
-		<key>disableIndentCorrections</key>
-		<false/>
-		<key>indentOnPaste</key>
-		<string>default</string>
-	</dict>
-	<key>uuid</key>
-	<string>B842F0A4-DB70-48CD-ACA7-CC3C760D4C0D</string>
-</dict>
-</plist>
diff --git a/bundles/html.tmbundle/Preferences/Miscellaneous.plist b/bundles/html.tmbundle/Preferences/Miscellaneous.plist
deleted file mode 100644
index 751bee5f1..000000000
--- a/bundles/html.tmbundle/Preferences/Miscellaneous.plist
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>name</key>
-	<string>Miscellaneous</string>
-	<key>scope</key>
-	<string>text.html</string>
-	<key>settings</key>
-	<dict>
-		<key>decreaseIndentPattern</key>
-		<string>(?x)
-		^\s*
-		(&lt;/(?!html)
-		  [A-Za-z0-9]+\b[^&gt;]*&gt;
-		|--&gt;
-		|&lt;\?(php)?\s+(else(if)?|end(if|for(each)?|while))
-		|\}
-		)</string>
-		<key>highlightPairs</key>
-		<array>
-			<array>
-				<string>(</string>
-				<string>)</string>
-			</array>
-			<array>
-				<string>{</string>
-				<string>}</string>
-			</array>
-			<array>
-				<string>[</string>
-				<string>]</string>
-			</array>
-			<array>
-				<string>“</string>
-				<string>”</string>
-			</array>
-			<array>
-				<string>&lt;</string>
-				<string>&gt;</string>
-			</array>
-		</array>
-		<key>increaseIndentPattern</key>
-		<string>(?x)
-		&lt;(?!\?|area|base|br|col|frame|hr|html|img|input|link|meta|param|[^&gt;]*/&gt;)
-		  ([A-Za-z0-9]+)(?=\s|&gt;)\b[^&gt;]*&gt;(?!.*&lt;/\1&gt;)
-		|&lt;!--(?!.*--&gt;)
-		|&lt;\?php.+?\b(if|else(?:if)?|for(?:each)?|while)\b.*:(?!.*end\1)
-		|\{[^}"']*$
-		</string>
-		<key>indentNextLinePattern</key>
-		<string>&lt;!DOCTYPE(?!.*&gt;)</string>
-		<key>shellVariables</key>
-		<array>
-			<dict>
-				<key>name</key>
-				<string>TM_HTML_EMPTY_TAGS</string>
-				<key>value</key>
-				<string>area|base|basefont|br|col|frame|hr|img|input|isindex|link|meta|param</string>
-			</dict>
-		</array>
-		<key>smartTypingPairs</key>
-		<array>
-			<array>
-				<string>"</string>
-				<string>"</string>
-			</array>
-			<array>
-				<string>(</string>
-				<string>)</string>
-			</array>
-			<array>
-				<string>{</string>
-				<string>}</string>
-			</array>
-			<array>
-				<string>[</string>
-				<string>]</string>
-			</array>
-			<array>
-				<string>“</string>
-				<string>”</string>
-			</array>
-			<array>
-				<string>&lt;</string>
-				<string>&gt;</string>
-			</array>
-		</array>
-	</dict>
-	<key>uuid</key>
-	<string>FC34BE82-69DC-47B0-997A-37A8763D4E69</string>
-</dict>
-</plist>
diff --git a/bundles/html.tmbundle/Preferences/Symbol List: ID.plist b/bundles/html.tmbundle/Preferences/Symbol List: ID.plist
deleted file mode 100644
index d3cf92351..000000000
--- a/bundles/html.tmbundle/Preferences/Symbol List: ID.plist	
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>name</key>
-	<string>Symbol List: ID</string>
-	<key>scope</key>
-	<string>text.html meta.toc-list.id.html</string>
-	<key>settings</key>
-	<dict>
-		<key>symbolTransformation</key>
-		<string>s/^/ID: /</string>
-	</dict>
-	<key>uuid</key>
-	<string>E7C5859E-122D-4382-84BE-5AB584DC2409</string>
-</dict>
-</plist>
diff --git a/bundles/html.tmbundle/Preferences/Tag Completions.tmPreferences b/bundles/html.tmbundle/Preferences/Tag Completions.tmPreferences
deleted file mode 100644
index aa35a4bc3..000000000
--- a/bundles/html.tmbundle/Preferences/Tag Completions.tmPreferences	
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>name</key>
-	<string>Completions HTML Tags</string>
-	<key>scope</key>
-	<string>text.html -(meta.tag | source), invalid.illegal.incomplete.html -source</string>
-	<key>settings</key>
-	<dict>
-		<key>shellVariables</key>
-		<array>
-			<dict>
-				<key>name</key>
-				<string>TM_COMPLETION_split</string>
-				<key>value</key>
-				<string>,</string>
-			</dict>
-			<dict>
-				<key>name</key>
-				<string>TM_COMPLETIONS</string>
-				<key>value</key>
-				<string>a,abbr,acronym,address,applet,area,article,aside,audio,b,base,basefont,bdo,big,blockquote,br,button,canvas,caption,center,cite,code,col,colgroup,dd,del,dfn,dir,div,dl,dt,em,fieldset,figcaption,figure,font,footer,form,frame,frameset,h1,h2,h3,h4,h5,h6,head,header,hgroup,hr,html,i,iframe,img,input,ins,isindex,kbd,label,legend,li,link,map,menu,meta,nav,noframes,noscript,object,ol,optgroup,option,p,param,pre,q,s,samp,script,section,select,small,span,strike,strong,style,sub,sup,table,tbody,td,textarea,tfoot,th,thead,time,title,tr,tt,u,ul,var,video</string>
-			</dict>
-		</array>
-	</dict>
-	<key>uuid</key>
-	<string>4720ADB8-DD17-4F97-A715-AFD72E22CE45</string>
-</dict>
-</plist>
diff --git a/bundles/html.tmbundle/Preferences/Tag preferences.plist b/bundles/html.tmbundle/Preferences/Tag preferences.plist
deleted file mode 100644
index 98f24bc52..000000000
--- a/bundles/html.tmbundle/Preferences/Tag preferences.plist	
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>name</key>
-	<string>Tag Preferences</string>
-	<key>scope</key>
-	<string>meta.tag</string>
-	<key>settings</key>
-	<dict>
-		<key>smartTypingPairs</key>
-		<array>
-			<array>
-				<string>"</string>
-				<string>"</string>
-			</array>
-			<array>
-				<string>(</string>
-				<string>)</string>
-			</array>
-			<array>
-				<string>{</string>
-				<string>}</string>
-			</array>
-			<array>
-				<string>[</string>
-				<string>]</string>
-			</array>
-			<array>
-				<string>“</string>
-				<string>”</string>
-			</array>
-			<array>
-				<string>&lt;</string>
-				<string>&gt;</string>
-			</array>
-			<array>
-				<string>'</string>
-				<string>'</string>
-			</array>
-		</array>
-		<key>spellChecking</key>
-		<string>0</string>
-	</dict>
-	<key>uuid</key>
-	<string>73251DBE-EBD2-470F-8148-E6F2EC1A9641</string>
-</dict>
-</plist>
diff --git a/bundles/html.tmbundle/README.mdown b/bundles/html.tmbundle/README.mdown
deleted file mode 100644
index 32d8f85a4..000000000
--- a/bundles/html.tmbundle/README.mdown
+++ /dev/null
@@ -1,20 +0,0 @@
-# Installation
-
-You can install this bundle in TextMate by opening the preferences and going to the bundles tab. After installation it will be automatically updated for you.
-
-# General
-
-* [Bundle Styleguide](http://kb.textmate.org/bundle_styleguide) — _before you make changes_
-* [Commit Styleguide](http://kb.textmate.org/commit_styleguide) — _before you send a pull request_
-* [Writing Bug Reports](http://kb.textmate.org/writing_bug_reports) — _before you report an issue_
-
-# License
-
-If not otherwise specified (see below), files in this repository fall under the following license:
-
-	Permission to copy, use, modify, sell and distribute this
-	software is granted. This software is provided "as is" without
-	express or implied warranty, and with no claim as to its
-	suitability for any purpose.
-
-An exception is made for files in readable text which contain their own license information, or files where an accompanying file exists (in the same directory) with a “-license” suffix added to the base-name name of the original file, and an extension of txt, html, or similar. For example “tidy” is accompanied by “tidy-license.txt”.
\ No newline at end of file
diff --git a/bundles/html.tmbundle/Snippets/Arrow (arrow).plist b/bundles/html.tmbundle/Snippets/Arrow (arrow).plist
deleted file mode 100644
index ec1abe29c..000000000
--- a/bundles/html.tmbundle/Snippets/Arrow (arrow).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>&amp;#x2192;</string>
-	<key>name</key>
-	<string>→</string>
-	<key>scope</key>
-	<string>text.html</string>
-	<key>tabTrigger</key>
-	<string>arrow</string>
-	<key>uuid</key>
-	<string>AC15621A-8A16-40DD-A671-EA4C37637215</string>
-</dict>
-</plist>
diff --git a/bundles/html.tmbundle/Snippets/Backspace (backspace).plist b/bundles/html.tmbundle/Snippets/Backspace (backspace).plist
deleted file mode 100644
index fb543c1fb..000000000
--- a/bundles/html.tmbundle/Snippets/Backspace (backspace).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>&amp;#x232B;</string>
-	<key>name</key>
-	<string>⌫</string>
-	<key>scope</key>
-	<string>text.html</string>
-	<key>tabTrigger</key>
-	<string>backspace</string>
-	<key>uuid</key>
-	<string>38E50882-27AF-4246-A039-355C3E1A699E</string>
-</dict>
-</plist>
diff --git a/bundles/html.tmbundle/Snippets/Backtab (backtab).plist b/bundles/html.tmbundle/Snippets/Backtab (backtab).plist
deleted file mode 100644
index b8c6293c5..000000000
--- a/bundles/html.tmbundle/Snippets/Backtab (backtab).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>&amp;#x21E4;</string>
-	<key>name</key>
-	<string>⇤</string>
-	<key>scope</key>
-	<string>text.html</string>
-	<key>tabTrigger</key>
-	<string>backtab</string>
-	<key>uuid</key>
-	<string>7F102705-27D8-4029-BF61-2F042FB61E06</string>
-</dict>
-</plist>
diff --git a/bundles/html.tmbundle/Snippets/Command (command).plist b/bundles/html.tmbundle/Snippets/Command (command).plist
deleted file mode 100644
index 593b01c14..000000000
--- a/bundles/html.tmbundle/Snippets/Command (command).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>&amp;#x2318;</string>
-	<key>name</key>
-	<string>⌘</string>
-	<key>scope</key>
-	<string>text.html</string>
-	<key>tabTrigger</key>
-	<string>command</string>
-	<key>uuid</key>
-	<string>7214ACD1-93D9-4D3F-A428-8A7302E0A35E</string>
-</dict>
-</plist>
diff --git a/bundles/html.tmbundle/Snippets/Control (control).plist b/bundles/html.tmbundle/Snippets/Control (control).plist
deleted file mode 100644
index 7ba800565..000000000
--- a/bundles/html.tmbundle/Snippets/Control (control).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>&amp;#x2303;</string>
-	<key>name</key>
-	<string>⌃</string>
-	<key>scope</key>
-	<string>text.html</string>
-	<key>tabTrigger</key>
-	<string>control</string>
-	<key>uuid</key>
-	<string>B4987DA5-9C2F-4D2D-AC14-678115079205</string>
-</dict>
-</plist>
diff --git a/bundles/html.tmbundle/Snippets/Delete (delete).plist b/bundles/html.tmbundle/Snippets/Delete (delete).plist
deleted file mode 100644
index 4956c9a1f..000000000
--- a/bundles/html.tmbundle/Snippets/Delete (delete).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>&amp;#x2326;</string>
-	<key>name</key>
-	<string>⌦</string>
-	<key>scope</key>
-	<string>text.html</string>
-	<key>tabTrigger</key>
-	<string>delete</string>
-	<key>uuid</key>
-	<string>44E448B6-37CE-4BFE-8611-C5113593B74B</string>
-</dict>
-</plist>
diff --git a/bundles/html.tmbundle/Snippets/DocType HTML 4.0 Strict.plist b/bundles/html.tmbundle/Snippets/DocType HTML 4.0 Strict.plist
deleted file mode 100644
index 87d86e6ce..000000000
--- a/bundles/html.tmbundle/Snippets/DocType HTML 4.0 Strict.plist	
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>&lt;!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-	"http://www.w3.org/TR/html4/strict.dtd"&gt;
-</string>
-	<key>name</key>
-	<string>HTML — 4.01 Strict</string>
-	<key>scope</key>
-	<string>text.html</string>
-	<key>tabTrigger</key>
-	<string>doctype</string>
-	<key>uuid</key>
-	<string>944F1410-188C-4D70-8340-CECAA56FC7F2</string>
-</dict>
-</plist>
diff --git a/bundles/html.tmbundle/Snippets/DocType HTML 5.plist b/bundles/html.tmbundle/Snippets/DocType HTML 5.plist
deleted file mode 100644
index 50f4d9096..000000000
--- a/bundles/html.tmbundle/Snippets/DocType HTML 5.plist	
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>&lt;!DOCTYPE html&gt;
-</string>
-	<key>name</key>
-	<string>HTML — 5</string>
-	<key>scope</key>
-	<string>text.html</string>
-	<key>tabTrigger</key>
-	<string>doctype</string>
-	<key>uuid</key>
-	<string>08E4F47C-A570-4F9B-A6AE-DCAC0D2E2420</string>
-</dict>
-</plist>
diff --git a/bundles/html.tmbundle/Snippets/DocType XHTL 1.0 Frameset.plist b/bundles/html.tmbundle/Snippets/DocType XHTL 1.0 Frameset.plist
deleted file mode 100644
index f343c304c..000000000
--- a/bundles/html.tmbundle/Snippets/DocType XHTL 1.0 Frameset.plist	
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>&lt;!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN"
-	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd"&gt;
-</string>
-	<key>name</key>
-	<string>XHTML — 1.0 Frameset</string>
-	<key>scope</key>
-	<string>text.html</string>
-	<key>tabTrigger</key>
-	<string>doctype</string>
-	<key>uuid</key>
-	<string>9ED6ABBE-A802-11D9-BFC8-000D93C8BE28</string>
-</dict>
-</plist>
diff --git a/bundles/html.tmbundle/Snippets/DocType XHTML 1.0 Strict.plist b/bundles/html.tmbundle/Snippets/DocType XHTML 1.0 Strict.plist
deleted file mode 100644
index a39e4886b..000000000
--- a/bundles/html.tmbundle/Snippets/DocType XHTML 1.0 Strict.plist	
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>&lt;!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"&gt;
-</string>
-	<key>name</key>
-	<string>XHTML — 1.0 Strict</string>
-	<key>scope</key>
-	<string>text.html</string>
-	<key>tabTrigger</key>
-	<string>doctype</string>
-	<key>uuid</key>
-	<string>C8B83564-A802-11D9-BFC8-000D93C8BE28</string>
-</dict>
-</plist>
diff --git a/bundles/html.tmbundle/Snippets/DocType XHTML 1.0 Transitional.plist b/bundles/html.tmbundle/Snippets/DocType XHTML 1.0 Transitional.plist
deleted file mode 100644
index ce850fa02..000000000
--- a/bundles/html.tmbundle/Snippets/DocType XHTML 1.0 Transitional.plist	
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>&lt;!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"&gt;
-</string>
-	<key>name</key>
-	<string>XHTML — 1.0 Transitional</string>
-	<key>scope</key>
-	<string>text.html</string>
-	<key>tabTrigger</key>
-	<string>doctype</string>
-	<key>uuid</key>
-	<string>7D8C2F74-A802-11D9-BFC8-000D93C8BE28</string>
-</dict>
-</plist>
diff --git a/bundles/html.tmbundle/Snippets/DocType XHTML 1.1.plist b/bundles/html.tmbundle/Snippets/DocType XHTML 1.1.plist
deleted file mode 100644
index 850eec593..000000000
--- a/bundles/html.tmbundle/Snippets/DocType XHTML 1.1.plist	
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>&lt;!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
-	"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"&gt;
-</string>
-	<key>name</key>
-	<string>XHTML — 1.1</string>
-	<key>scope</key>
-	<string>text.html</string>
-	<key>tabTrigger</key>
-	<string>doctype</string>
-	<key>uuid</key>
-	<string>5CE8FC6E-A802-11D9-BFC8-000D93C8BE28</string>
-</dict>
-</plist>
diff --git a/bundles/html.tmbundle/Snippets/Down (down).plist b/bundles/html.tmbundle/Snippets/Down (down).plist
deleted file mode 100644
index 5370e3e2e..000000000
--- a/bundles/html.tmbundle/Snippets/Down (down).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>&amp;#x2193;</string>
-	<key>name</key>
-	<string>↓</string>
-	<key>scope</key>
-	<string>text.html</string>
-	<key>tabTrigger</key>
-	<string>down</string>
-	<key>uuid</key>
-	<string>35654B4E-2D76-4CD3-8FBB-2DA1F314BA19</string>
-</dict>
-</plist>
diff --git a/bundles/html.tmbundle/Snippets/Embed QT movie (movie).plist b/bundles/html.tmbundle/Snippets/Embed QT movie (movie).plist
deleted file mode 100644
index e9e2de213..000000000
--- a/bundles/html.tmbundle/Snippets/Embed QT movie (movie).plist	
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>&lt;object width="$2" height="$3" classid="clsid:02BF25D5-8C17-4B23-BC80-D3488ABDDC6B" codebase="http://www.apple.com/qtactivex/qtplugin.cab"&gt;
-	&lt;param name="src" value="$1"${TM_XHTML}&gt;
-	&lt;param name="controller" value="$4"${TM_XHTML}&gt;
-	&lt;param name="autoplay" value="$5"${TM_XHTML}&gt;
-	&lt;embed src="${1:movie.mov}"
-		width="${2:320}" height="${3:240}"
-		controller="${4:true}" autoplay="${5:true}"
-		scale="tofit" cache="true"
-		pluginspage="http://www.apple.com/quicktime/download/"
-	${TM_XHTML}&gt;
-&lt;/object&gt;</string>
-	<key>name</key>
-	<string>Embed QT Movie</string>
-	<key>scope</key>
-	<string>text.html</string>
-	<key>tabTrigger</key>
-	<string>movie</string>
-	<key>uuid</key>
-	<string>42F15753-9B6D-4DD8-984C-807B94363277</string>
-</dict>
-</plist>
diff --git a/bundles/html.tmbundle/Snippets/Emphasize.tmSnippet b/bundles/html.tmbundle/Snippets/Emphasize.tmSnippet
deleted file mode 100644
index 1d7faf76c..000000000
--- a/bundles/html.tmbundle/Snippets/Emphasize.tmSnippet
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>${0:${TM_SELECTED_TEXT/\A&lt;em&gt;(.*)&lt;\/em&gt;\z|.*/(?1:$1:&lt;em&gt;$0&lt;/em&gt;)/m}}</string>
-	<key>keyEquivalent</key>
-	<string>@i</string>
-	<key>name</key>
-	<string>Emphasize</string>
-	<key>scope</key>
-	<string>text.html</string>
-	<key>uuid</key>
-	<string>EBB98620-3292-4621-BA38-D8A9A65D9551</string>
-</dict>
-</plist>
diff --git a/bundles/html.tmbundle/Snippets/Enter (enter).plist b/bundles/html.tmbundle/Snippets/Enter (enter).plist
deleted file mode 100644
index d94bd0ea1..000000000
--- a/bundles/html.tmbundle/Snippets/Enter (enter).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>&amp;#x2305;</string>
-	<key>name</key>
-	<string>⌅</string>
-	<key>scope</key>
-	<string>text.html</string>
-	<key>tabTrigger</key>
-	<string>enter</string>
-	<key>uuid</key>
-	<string>7062316B-4236-4793-AD35-05E4A6577393</string>
-</dict>
-</plist>
diff --git a/bundles/html.tmbundle/Snippets/Escape (escape).plist b/bundles/html.tmbundle/Snippets/Escape (escape).plist
deleted file mode 100644
index 85967b0eb..000000000
--- a/bundles/html.tmbundle/Snippets/Escape (escape).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>&amp;#x238B;</string>
-	<key>name</key>
-	<string>⎋</string>
-	<key>scope</key>
-	<string>text.html</string>
-	<key>tabTrigger</key>
-	<string>escape</string>
-	<key>uuid</key>
-	<string>D7CC7C7C-CD01-4357-AF91-AEFFD914DF98</string>
-</dict>
-</plist>
diff --git a/bundles/html.tmbundle/Snippets/Fieldset.tmSnippet b/bundles/html.tmbundle/Snippets/Fieldset.tmSnippet
deleted file mode 100644
index b2fdbc8a7..000000000
--- a/bundles/html.tmbundle/Snippets/Fieldset.tmSnippet
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>bundleUUID</key>
-	<string>4676FC6D-6227-11D9-BFB1-000D93589AF6</string>
-	<key>content</key>
-	<string>&lt;fieldset id="${1/[[:alpha:]]+|( )/(?1:_:\L$0)/g}" ${2:class="${3:}"}&gt;
-	&lt;legend&gt;${1:$TM_SELECTED_TEXT}&lt;/legend&gt;
-	
-	$0
-&lt;/fieldset&gt;</string>
-	<key>name</key>
-	<string>Fieldset</string>
-	<key>scope</key>
-	<string>text.html</string>
-	<key>tabTrigger</key>
-	<string>fieldset</string>
-	<key>uuid</key>
-	<string>9BD2BE01-A854-4D55-B584-725D04C075C0</string>
-</dict>
-</plist>
diff --git a/bundles/html.tmbundle/Snippets/HTML — 4.0 Transitional (doctype).plist b/bundles/html.tmbundle/Snippets/HTML — 4.0 Transitional (doctype).plist
deleted file mode 100644
index 559854642..000000000
--- a/bundles/html.tmbundle/Snippets/HTML — 4.0 Transitional (doctype).plist	
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>&lt;!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-	"http://www.w3.org/TR/html4/loose.dtd"&gt;
-</string>
-	<key>name</key>
-	<string>HTML — 4.01 Transitional</string>
-	<key>scope</key>
-	<string>text.html</string>
-	<key>tabTrigger</key>
-	<string>doctype</string>
-	<key>uuid</key>
-	<string>B2AAEE56-42D8-42C3-8F67-865473F50E8D</string>
-</dict>
-</plist>
diff --git a/bundles/html.tmbundle/Snippets/IE Conditional Comment: Internet Explorer 5_0 only.tmSnippet b/bundles/html.tmbundle/Snippets/IE Conditional Comment: Internet Explorer 5_0 only.tmSnippet
deleted file mode 100644
index 53c2ffab1..000000000
--- a/bundles/html.tmbundle/Snippets/IE Conditional Comment: Internet Explorer 5_0 only.tmSnippet	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>&lt;!--[if IE 5.0]&gt;${1:${TM_SELECTED_TEXT:   IE Conditional Comment: Internet Explorer 5.0 only }}&lt;![endif]--&gt;$0</string>
-	<key>name</key>
-	<string>IE Conditional Comment: Internet Explorer 5.0 only</string>
-	<key>scope</key>
-	<string>text.html</string>
-	<key>tabTrigger</key>
-	<string>!</string>
-	<key>uuid</key>
-	<string>3A517A94-001E-464D-8184-1FE56D0D0D70</string>
-</dict>
-</plist>
diff --git a/bundles/html.tmbundle/Snippets/IE Conditional Comment: Internet Explorer 5_5 only.tmSnippet b/bundles/html.tmbundle/Snippets/IE Conditional Comment: Internet Explorer 5_5 only.tmSnippet
deleted file mode 100644
index 67f0c949f..000000000
--- a/bundles/html.tmbundle/Snippets/IE Conditional Comment: Internet Explorer 5_5 only.tmSnippet	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>&lt;!--[if IE 5.5000]&gt;${1:${TM_SELECTED_TEXT:   IE Conditional Comment: Internet Explorer 5.5 only }}&lt;![endif]--&gt;$0</string>
-	<key>name</key>
-	<string>IE Conditional Comment: Internet Explorer 5.5 only</string>
-	<key>scope</key>
-	<string>text.html</string>
-	<key>tabTrigger</key>
-	<string>!</string>
-	<key>uuid</key>
-	<string>E3F8984E-7269-4981-9D30-967AB56A6ACE</string>
-</dict>
-</plist>
diff --git a/bundles/html.tmbundle/Snippets/IE Conditional Comment: Internet Explorer 5_x.tmSnippet b/bundles/html.tmbundle/Snippets/IE Conditional Comment: Internet Explorer 5_x.tmSnippet
deleted file mode 100644
index b4857574a..000000000
--- a/bundles/html.tmbundle/Snippets/IE Conditional Comment: Internet Explorer 5_x.tmSnippet	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>&lt;!--[if lt IE 6]&gt;${1:${TM_SELECTED_TEXT:  IE Conditional Comment: Internet Explorer 5.x      }}&lt;![endif]--&gt;$0</string>
-	<key>name</key>
-	<string>IE Conditional Comment: Internet Explorer 5.x</string>
-	<key>scope</key>
-	<string>text.html</string>
-	<key>tabTrigger</key>
-	<string>!</string>
-	<key>uuid</key>
-	<string>F3512848-7889-45DA-993B-0547976C8E6D</string>
-</dict>
-</plist>
diff --git a/bundles/html.tmbundle/Snippets/IE Conditional Comment: Internet Explorer 6 and below.tmSnippet b/bundles/html.tmbundle/Snippets/IE Conditional Comment: Internet Explorer 6 and below.tmSnippet
deleted file mode 100644
index b2a8b7c4b..000000000
--- a/bundles/html.tmbundle/Snippets/IE Conditional Comment: Internet Explorer 6 and below.tmSnippet	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>&lt;!--[if lte IE 6]&gt;${1:${TM_SELECTED_TEXT: IE Conditional Comment: Internet Explorer 6 and below }}&lt;![endif]--&gt;$0</string>
-	<key>name</key>
-	<string>IE Conditional Comment: Internet Explorer 6 and below</string>
-	<key>scope</key>
-	<string>text.html</string>
-	<key>tabTrigger</key>
-	<string>!</string>
-	<key>uuid</key>
-	<string>32BBB9AB-8732-4F91-A587-354941A27B69</string>
-</dict>
-</plist>
diff --git a/bundles/html.tmbundle/Snippets/IE Conditional Comment: Internet Explorer 6 only.tmSnippet b/bundles/html.tmbundle/Snippets/IE Conditional Comment: Internet Explorer 6 only.tmSnippet
deleted file mode 100644
index 6255f7ce1..000000000
--- a/bundles/html.tmbundle/Snippets/IE Conditional Comment: Internet Explorer 6 only.tmSnippet	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>&lt;!--[if IE 6]&gt;${1:${TM_SELECTED_TEXT:     IE Conditional Comment: Internet Explorer 6 only   }}&lt;![endif]--&gt;$0</string>
-	<key>name</key>
-	<string>IE Conditional Comment: Internet Explorer 6 only</string>
-	<key>scope</key>
-	<string>text.html</string>
-	<key>tabTrigger</key>
-	<string>!</string>
-	<key>uuid</key>
-	<string>48DF7485-52EA-49B3-88AF-3A41F933F325</string>
-</dict>
-</plist>
diff --git a/bundles/html.tmbundle/Snippets/IE Conditional Comment: Internet Explorer 7+.tmSnippet b/bundles/html.tmbundle/Snippets/IE Conditional Comment: Internet Explorer 7+.tmSnippet
deleted file mode 100644
index 4d0d91c37..000000000
--- a/bundles/html.tmbundle/Snippets/IE Conditional Comment: Internet Explorer 7+.tmSnippet	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>&lt;!--[if gte IE 7]&gt;${1:${TM_SELECTED_TEXT: IE Conditional Comment: Internet Explorer 7 and above }}&lt;![endif]--&gt;$0</string>
-	<key>name</key>
-	<string>IE Conditional Comment: Internet Explorer 7 and above</string>
-	<key>scope</key>
-	<string>text.html</string>
-	<key>tabTrigger</key>
-	<string>!</string>
-	<key>uuid</key>
-	<string>CBC24AF4-88E0-498B-BE50-934B9CF29EC7</string>
-</dict>
-</plist>
diff --git a/bundles/html.tmbundle/Snippets/IE Conditional Comment: Internet Explorer.tmSnippet b/bundles/html.tmbundle/Snippets/IE Conditional Comment: Internet Explorer.tmSnippet
deleted file mode 100644
index c71a122b8..000000000
--- a/bundles/html.tmbundle/Snippets/IE Conditional Comment: Internet Explorer.tmSnippet	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>&lt;!--[if IE]&gt;${1:${TM_SELECTED_TEXT:       IE Conditional Comment: Internet Explorer          }}&lt;![endif]--&gt;$0</string>
-	<key>name</key>
-	<string>IE Conditional Comment: Internet Explorer</string>
-	<key>scope</key>
-	<string>text.html</string>
-	<key>tabTrigger</key>
-	<string>!</string>
-	<key>uuid</key>
-	<string>0ED6DA73-F38F-4A65-B18F-3379D2BA9387</string>
-</dict>
-</plist>
diff --git a/bundles/html.tmbundle/Snippets/IE Conditional Comment: NOT Internet Explorer.tmSnippet b/bundles/html.tmbundle/Snippets/IE Conditional Comment: NOT Internet Explorer.tmSnippet
deleted file mode 100644
index 7e90f502a..000000000
--- a/bundles/html.tmbundle/Snippets/IE Conditional Comment: NOT Internet Explorer.tmSnippet	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>&lt;!--[if !IE]&gt;&lt;!--&gt;${1:${TM_SELECTED_TEXT:  IE Conditional Comment: NOT Internet Explorer      }}&lt;!-- &lt;![endif]--&gt;$0</string>
-	<key>name</key>
-	<string>IE Conditional Comment: NOT Internet Explorer</string>
-	<key>scope</key>
-	<string>text.html</string>
-	<key>tabTrigger</key>
-	<string>!</string>
-	<key>uuid</key>
-	<string>F00170EE-4A82-413F-A88B-85293E69A88B</string>
-</dict>
-</plist>
diff --git a/bundles/html.tmbundle/Snippets/Input with Label.tmSnippet b/bundles/html.tmbundle/Snippets/Input with Label.tmSnippet
deleted file mode 100644
index ccd264db3..000000000
--- a/bundles/html.tmbundle/Snippets/Input with Label.tmSnippet	
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>bundleUUID</key>
-	<string>4676FC6D-6227-11D9-BFB1-000D93589AF6</string>
-	<key>content</key>
-	<string>&lt;label for="${2:${1/[[:alpha:]]+|( )/(?1:_:\L$0)/g}}"&gt;$1&lt;/label&gt;&lt;input type="${3|text,submit,hidden,button|}" name="${4:$2}" value="$5"${6: id="${7:$2}"}${TM_XHTML}&gt;
-</string>
-	<key>name</key>
-	<string>Input with Label</string>
-	<key>scope</key>
-	<string>text.html</string>
-	<key>tabTrigger</key>
-	<string>input</string>
-	<key>uuid</key>
-	<string>D8DCCC81-749A-4E2A-B4BC-D109D5799CAA</string>
-</dict>
-</plist>
diff --git a/bundles/html.tmbundle/Snippets/Left (left).plist b/bundles/html.tmbundle/Snippets/Left (left).plist
deleted file mode 100644
index 394c06e15..000000000
--- a/bundles/html.tmbundle/Snippets/Left (left).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>&amp;#x2190;</string>
-	<key>name</key>
-	<string>←</string>
-	<key>scope</key>
-	<string>text.html</string>
-	<key>tabTrigger</key>
-	<string>left</string>
-	<key>uuid</key>
-	<string>C0418A4A-7E42-4D49-8F86-6E339296CB84</string>
-</dict>
-</plist>
diff --git a/bundles/html.tmbundle/Snippets/Option (option).plist b/bundles/html.tmbundle/Snippets/Option (option).plist
deleted file mode 100644
index d146262f8..000000000
--- a/bundles/html.tmbundle/Snippets/Option (option).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>&amp;#x2325;</string>
-	<key>name</key>
-	<string>⌥</string>
-	<key>scope</key>
-	<string>text.html</string>
-	<key>tabTrigger</key>
-	<string>option</string>
-	<key>uuid</key>
-	<string>980A8D39-CA8B-4EC2-9739-DC36A262F28E</string>
-</dict>
-</plist>
diff --git a/bundles/html.tmbundle/Snippets/Option.tmSnippet b/bundles/html.tmbundle/Snippets/Option.tmSnippet
deleted file mode 100644
index ef5ca0ef9..000000000
--- a/bundles/html.tmbundle/Snippets/Option.tmSnippet
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>bundleUUID</key>
-	<string>4676FC6D-6227-11D9-BFB1-000D93589AF6</string>
-	<key>content</key>
-	<string>&lt;option${1: value="${2:option}"}&gt;${3:$2}&lt;/option&gt;</string>
-	<key>name</key>
-	<string>Option</string>
-	<key>scope</key>
-	<string>text.html</string>
-	<key>tabTrigger</key>
-	<string>opt</string>
-	<key>uuid</key>
-	<string>5820372E-A093-4F38-B25C-B0CCC50A0FC4</string>
-</dict>
-</plist>
diff --git a/bundles/html.tmbundle/Snippets/Return (return).plist b/bundles/html.tmbundle/Snippets/Return (return).plist
deleted file mode 100644
index acc6255bf..000000000
--- a/bundles/html.tmbundle/Snippets/Return (return).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>&amp;#x21A9;</string>
-	<key>name</key>
-	<string>↩</string>
-	<key>scope</key>
-	<string>text.html</string>
-	<key>tabTrigger</key>
-	<string>return</string>
-	<key>uuid</key>
-	<string>9B216475-D73D-4518-851F-CACD0066A909</string>
-</dict>
-</plist>
diff --git a/bundles/html.tmbundle/Snippets/Right (right).plist b/bundles/html.tmbundle/Snippets/Right (right).plist
deleted file mode 100644
index bc07f0d03..000000000
--- a/bundles/html.tmbundle/Snippets/Right (right).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>&amp;#x2192;</string>
-	<key>name</key>
-	<string>→</string>
-	<key>scope</key>
-	<string>text.html</string>
-	<key>tabTrigger</key>
-	<string>right</string>
-	<key>uuid</key>
-	<string>C70BB693-0954-4440-AEB4-F2ADD6D923F0</string>
-</dict>
-</plist>
diff --git a/bundles/html.tmbundle/Snippets/Select Box.tmSnippet b/bundles/html.tmbundle/Snippets/Select Box.tmSnippet
deleted file mode 100644
index f86f34731..000000000
--- a/bundles/html.tmbundle/Snippets/Select Box.tmSnippet	
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>bundleUUID</key>
-	<string>4676FC6D-6227-11D9-BFB1-000D93589AF6</string>
-	<key>content</key>
-	<string>&lt;select name="${1:some_name}" id="${2:$1}"${3:${4: multiple}${5: onchange="${6:}"}${7: size="${8:1}"}}&gt;
-	&lt;option${9: value="${10:option1}"}&gt;${11:$10}&lt;/option&gt;
-	&lt;option${12: value="${13:option2}"}&gt;${14:$13}&lt;/option&gt;${15:}
-	$0
-&lt;/select&gt;</string>
-	<key>name</key>
-	<string>Select Box</string>
-	<key>scope</key>
-	<string>text.html</string>
-	<key>tabTrigger</key>
-	<string>select</string>
-	<key>uuid</key>
-	<string>26023CFF-C73F-4EF5-9803-E4DBA2CBEADD</string>
-</dict>
-</plist>
diff --git a/bundles/html.tmbundle/Snippets/Shift (shift).plist b/bundles/html.tmbundle/Snippets/Shift (shift).plist
deleted file mode 100644
index 1c1d783f7..000000000
--- a/bundles/html.tmbundle/Snippets/Shift (shift).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>&amp;#x21E7;</string>
-	<key>name</key>
-	<string>⇧</string>
-	<key>scope</key>
-	<string>text.html</string>
-	<key>tabTrigger</key>
-	<string>shift</string>
-	<key>uuid</key>
-	<string>1B8D58B9-D9DB-484C-AACD-5D5DF5385308</string>
-</dict>
-</plist>
diff --git a/bundles/html.tmbundle/Snippets/Smart return:indent for tag pairs.plist b/bundles/html.tmbundle/Snippets/Smart return:indent for tag pairs.plist
deleted file mode 100644
index d819f1e4d..000000000
--- a/bundles/html.tmbundle/Snippets/Smart return:indent for tag pairs.plist	
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>
-	$0
-</string>
-	<key>keyEquivalent</key>
-	<string>
</string>
-	<key>name</key>
-	<string>Special: Return Inside Empty Open/Close Tags</string>
-	<key>scope</key>
-	<string>meta.scope.between-tag-pair</string>
-	<key>uuid</key>
-	<string>3C44EABE-8D6F-4B1B-AB91-F419FAD1A0AD</string>
-</dict>
-</plist>
diff --git a/bundles/html.tmbundle/Snippets/Strong.tmSnippet b/bundles/html.tmbundle/Snippets/Strong.tmSnippet
deleted file mode 100644
index a78b78257..000000000
--- a/bundles/html.tmbundle/Snippets/Strong.tmSnippet
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>${0:${TM_SELECTED_TEXT/\A&lt;strong&gt;(.*)&lt;\/strong&gt;\z|.*/(?1:$1:&lt;strong&gt;$0&lt;/strong&gt;)/m}}</string>
-	<key>keyEquivalent</key>
-	<string>@b</string>
-	<key>name</key>
-	<string>Strong</string>
-	<key>scope</key>
-	<string>text.html</string>
-	<key>uuid</key>
-	<string>4117D930-B6FA-4022-97E7-ECCAF4E70F63</string>
-</dict>
-</plist>
diff --git a/bundles/html.tmbundle/Snippets/Tab (tab).plist b/bundles/html.tmbundle/Snippets/Tab (tab).plist
deleted file mode 100644
index 0f0098a29..000000000
--- a/bundles/html.tmbundle/Snippets/Tab (tab).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>&amp;#x21E5;</string>
-	<key>name</key>
-	<string>⇥</string>
-	<key>scope</key>
-	<string>text.html</string>
-	<key>tabTrigger</key>
-	<string>tab</string>
-	<key>uuid</key>
-	<string>ADC78A82-40C2-4AAC-8968-93AF0ED98DF0</string>
-</dict>
-</plist>
diff --git a/bundles/html.tmbundle/Snippets/Up (up).plist b/bundles/html.tmbundle/Snippets/Up (up).plist
deleted file mode 100644
index df5066279..000000000
--- a/bundles/html.tmbundle/Snippets/Up (up).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>&amp;#x2191;</string>
-	<key>name</key>
-	<string>↑</string>
-	<key>scope</key>
-	<string>text.html</string>
-	<key>tabTrigger</key>
-	<string>up</string>
-	<key>uuid</key>
-	<string>0E2F4A47-EADE-4A05-931E-FC874FA28FC3</string>
-</dict>
-</plist>
diff --git a/bundles/html.tmbundle/Snippets/Wrap Selection In Tag.plist b/bundles/html.tmbundle/Snippets/Wrap Selection In Tag.plist
deleted file mode 100644
index 3dead5d23..000000000
--- a/bundles/html.tmbundle/Snippets/Wrap Selection In Tag.plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>&lt;${1:p}&gt;$TM_SELECTED_TEXT&lt;/${1/\s.*//}&gt;</string>
-	<key>keyEquivalent</key>
-	<string>^W</string>
-	<key>name</key>
-	<string>Wrap Selection in Open/Close Tag</string>
-	<key>scope</key>
-	<string>text.html,</string>
-	<key>uuid</key>
-	<string>BC8B8AE2-5F16-11D9-B9C3-000D93589AF6</string>
-</dict>
-</plist>
diff --git a/bundles/html.tmbundle/Snippets/Wrap in <?= … ?>.plist b/bundles/html.tmbundle/Snippets/Wrap in <?= … ?>.plist
deleted file mode 100644
index 7619e51c3..000000000
--- a/bundles/html.tmbundle/Snippets/Wrap in <?= … ?>.plist	
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>&lt;?= $TM_SELECTED_TEXT ?&gt;</string>
-	<key>name</key>
-	<string>Wrap in &lt;?= … ?&gt;</string>
-	<key>scope</key>
-	<string>text.html string</string>
-	<key>uuid</key>
-	<string>912906A0-9A29-434B-AE98-E9DFDE6E48B4</string>
-</dict>
-</plist>
diff --git a/bundles/html.tmbundle/Snippets/XHTML   <input>.plist b/bundles/html.tmbundle/Snippets/XHTML   <input>.plist
deleted file mode 100644
index ddcfc8081..000000000
--- a/bundles/html.tmbundle/Snippets/XHTML   <input>.plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>&lt;input type="${1|text,submit,hidden,button|}" name="${2:some_name}" value="$3"${4: id="${5:$2}"}${TM_XHTML}&gt;</string>
-	<key>name</key>
-	<string>Input</string>
-	<key>scope</key>
-	<string>text.html</string>
-	<key>tabTrigger</key>
-	<string>input</string>
-	<key>uuid</key>
-	<string>44180979-A08E-11D9-A5A2-000D93C8BE28</string>
-</dict>
-</plist>
diff --git a/bundles/html.tmbundle/Snippets/XHTML   <textarea>.plist b/bundles/html.tmbundle/Snippets/XHTML   <textarea>.plist
deleted file mode 100644
index fdf20c3d9..000000000
--- a/bundles/html.tmbundle/Snippets/XHTML   <textarea>.plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>&lt;textarea name="${1:Name}" rows="${2:8}" cols="${3:40}"&gt;$0&lt;/textarea&gt;</string>
-	<key>name</key>
-	<string>Text Area</string>
-	<key>scope</key>
-	<string>text.html</string>
-	<key>tabTrigger</key>
-	<string>textarea</string>
-	<key>uuid</key>
-	<string>AAC9D7B8-A12C-11D9-A5A2-000D93C8BE28</string>
-</dict>
-</plist>
diff --git a/bundles/html.tmbundle/Snippets/XHTML &nbsp; NonBreakingSpace.plist b/bundles/html.tmbundle/Snippets/XHTML &nbsp; NonBreakingSpace.plist
deleted file mode 100644
index 65001b6ad..000000000
--- a/bundles/html.tmbundle/Snippets/XHTML &nbsp; NonBreakingSpace.plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>&amp;nbsp;</string>
-	<key>keyEquivalent</key>
-	<string>~ </string>
-	<key>name</key>
-	<string>Non-Breaking Space</string>
-	<key>scope</key>
-	<string>text.html</string>
-	<key>uuid</key>
-	<string>73B40BAE-A295-11D9-87F7-000D93C8BE28</string>
-</dict>
-</plist>
diff --git a/bundles/html.tmbundle/Snippets/XHTML <a mailto: >.plist b/bundles/html.tmbundle/Snippets/XHTML <a mailto: >.plist
deleted file mode 100644
index 5e63d321e..000000000
--- a/bundles/html.tmbundle/Snippets/XHTML <a mailto: >.plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>&lt;a href="mailto:${1:joe@example.com}?subject=${2:feedback}"&gt;${3:email me}&lt;/a&gt;</string>
-	<key>name</key>
-	<string>Mail Anchor</string>
-	<key>scope</key>
-	<string>text.html</string>
-	<key>tabTrigger</key>
-	<string>mailto</string>
-	<key>uuid</key>
-	<string>81DA4C74-A530-11D9-9BCD-000D93C8BE28</string>
-</dict>
-</plist>
diff --git a/bundles/html.tmbundle/Snippets/XHTML <base>.plist b/bundles/html.tmbundle/Snippets/XHTML <base>.plist
deleted file mode 100644
index 75569e9d9..000000000
--- a/bundles/html.tmbundle/Snippets/XHTML <base>.plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>&lt;base href="$1"${2: target="$3"}${TM_XHTML}&gt;</string>
-	<key>name</key>
-	<string>Base</string>
-	<key>scope</key>
-	<string>text.html</string>
-	<key>tabTrigger</key>
-	<string>base</string>
-	<key>uuid</key>
-	<string>4462A6B8-A08A-11D9-A5A2-000D93C8BE28</string>
-</dict>
-</plist>
diff --git a/bundles/html.tmbundle/Snippets/XHTML <body>.plist b/bundles/html.tmbundle/Snippets/XHTML <body>.plist
deleted file mode 100644
index 01eab9df5..000000000
--- a/bundles/html.tmbundle/Snippets/XHTML <body>.plist	
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>&lt;body id="${1:${TM_FILENAME/(.*)\..*/\L$1/}}"${2: onload="$3"}&gt;
-	$0
-&lt;/body&gt;</string>
-	<key>name</key>
-	<string>Body</string>
-	<key>scope</key>
-	<string>text.html</string>
-	<key>tabTrigger</key>
-	<string>body</string>
-	<key>uuid</key>
-	<string>4905D47B-A08B-11D9-A5A2-000D93C8BE28</string>
-</dict>
-</plist>
diff --git a/bundles/html.tmbundle/Snippets/XHTML <br :>.plist b/bundles/html.tmbundle/Snippets/XHTML <br :>.plist
deleted file mode 100644
index d812624da..000000000
--- a/bundles/html.tmbundle/Snippets/XHTML <br :>.plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>&lt;br${TM_XHTML}&gt;</string>
-	<key>keyEquivalent</key>
-	<string>^
</string>
-	<key>name</key>
-	<string>Br</string>
-	<key>scope</key>
-	<string>text.html</string>
-	<key>uuid</key>
-	<string>3E008E42-A5C9-11D9-9BCD-000D93C8BE28</string>
-</dict>
-</plist>
diff --git a/bundles/html.tmbundle/Snippets/XHTML <div>.plist b/bundles/html.tmbundle/Snippets/XHTML <div>.plist
deleted file mode 100644
index ab6678c34..000000000
--- a/bundles/html.tmbundle/Snippets/XHTML <div>.plist	
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>&lt;div${1: id="${2:name}"}&gt;
-	${0:$TM_SELECTED_TEXT}
-&lt;/div&gt;</string>
-	<key>name</key>
-	<string>Div</string>
-	<key>scope</key>
-	<string>text.html</string>
-	<key>tabTrigger</key>
-	<string>div</string>
-	<key>uuid</key>
-	<string>576036C0-A60E-11D9-ABD6-000D93C8BE28</string>
-</dict>
-</plist>
diff --git a/bundles/html.tmbundle/Snippets/XHTML <form>.plist b/bundles/html.tmbundle/Snippets/XHTML <form>.plist
deleted file mode 100644
index 71b843a02..000000000
--- a/bundles/html.tmbundle/Snippets/XHTML <form>.plist	
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>&lt;form action="${1:${TM_FILENAME/(.*?)\..*/$1_submit/}}" method="${2:get}" accept-charset="utf-8"&gt;
-	$0
-
-	&lt;p&gt;&lt;input type="submit" value="Continue &amp;rarr;"${TM_XHTML}&gt;&lt;/p&gt;
-&lt;/form&gt;</string>
-	<key>name</key>
-	<string>Form</string>
-	<key>scope</key>
-	<string>text.html</string>
-	<key>tabTrigger</key>
-	<string>form</string>
-	<key>uuid</key>
-	<string>232C2E8B-A08E-11D9-A5A2-000D93C8BE28</string>
-</dict>
-</plist>
diff --git a/bundles/html.tmbundle/Snippets/XHTML <h1>.plist b/bundles/html.tmbundle/Snippets/XHTML <h1>.plist
deleted file mode 100644
index f52736f8d..000000000
--- a/bundles/html.tmbundle/Snippets/XHTML <h1>.plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>&lt;h1 id="${1/[[:alpha:]]+|( )/(?1:_:\L$0)/g}"&gt;${1:$TM_SELECTED_TEXT}&lt;/h1&gt;</string>
-	<key>name</key>
-	<string>Heading</string>
-	<key>scope</key>
-	<string>text.html</string>
-	<key>tabTrigger</key>
-	<string>h1</string>
-	<key>uuid</key>
-	<string>65BA66DC-A07F-11D9-A5A2-000D93C8BE28</string>
-</dict>
-</plist>
diff --git a/bundles/html.tmbundle/Snippets/XHTML <head>.plist b/bundles/html.tmbundle/Snippets/XHTML <head>.plist
deleted file mode 100644
index da3483415..000000000
--- a/bundles/html.tmbundle/Snippets/XHTML <head>.plist	
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>&lt;head&gt;
-	&lt;meta http-equiv="Content-type" content="text/html; charset=utf-8"${TM_XHTML}&gt;
-	&lt;title&gt;${1:${TM_FILENAME/((.+)\..*)?/(?2:$2:Page Title)/}}&lt;/title&gt;
-	$0
-&lt;/head&gt;</string>
-	<key>name</key>
-	<string>Head</string>
-	<key>scope</key>
-	<string>text.html - text.html source</string>
-	<key>tabTrigger</key>
-	<string>head</string>
-	<key>uuid</key>
-	<string>9CF008C4-A086-11D9-A5A2-000D93C8BE28</string>
-</dict>
-</plist>
diff --git a/bundles/html.tmbundle/Snippets/XHTML <link>.plist b/bundles/html.tmbundle/Snippets/XHTML <link>.plist
deleted file mode 100644
index e0df4b1da..000000000
--- a/bundles/html.tmbundle/Snippets/XHTML <link>.plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>&lt;link rel="${1:stylesheet}" href="${2:/css/master.css}" type="text/css" media="${3|screen,all,braille,embossed,handheld,print,projection,speech,tty,tv|" title="${4:no title}" charset="${5:utf-8}"${TM_XHTML}&gt;</string>
-	<key>name</key>
-	<string>Link</string>
-	<key>scope</key>
-	<string>text.html</string>
-	<key>tabTrigger</key>
-	<string>link</string>
-	<key>uuid</key>
-	<string>77BFD0C0-A08A-11D9-A5A2-000D93C8BE28</string>
-</dict>
-</plist>
diff --git a/bundles/html.tmbundle/Snippets/XHTML <meta>.plist b/bundles/html.tmbundle/Snippets/XHTML <meta>.plist
deleted file mode 100644
index 57da172c4..000000000
--- a/bundles/html.tmbundle/Snippets/XHTML <meta>.plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>&lt;meta name="${1:name}" content="${2:content}"${TM_XHTML}&gt;</string>
-	<key>name</key>
-	<string>Meta</string>
-	<key>scope</key>
-	<string>text.html</string>
-	<key>tabTrigger</key>
-	<string>meta</string>
-	<key>uuid</key>
-	<string>DA99AC44-A083-11D9-A5A2-000D93C8BE28</string>
-</dict>
-</plist>
diff --git a/bundles/html.tmbundle/Snippets/XHTML <script src...>.plist b/bundles/html.tmbundle/Snippets/XHTML <script src...>.plist
deleted file mode 100644
index 53f654080..000000000
--- a/bundles/html.tmbundle/Snippets/XHTML <script src...>.plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>&lt;script src="$1" type="text/javascript" charset="${3:utf-8}"&gt;&lt;/script&gt;</string>
-	<key>name</key>
-	<string>Script With External Source</string>
-	<key>scope</key>
-	<string>text.html</string>
-	<key>tabTrigger</key>
-	<string>scriptsrc</string>
-	<key>uuid</key>
-	<string>7D676C4C-A087-11D9-A5A2-000D93C8BE28</string>
-</dict>
-</plist>
diff --git a/bundles/html.tmbundle/Snippets/XHTML <script>.plist b/bundles/html.tmbundle/Snippets/XHTML <script>.plist
deleted file mode 100644
index 2636e2462..000000000
--- a/bundles/html.tmbundle/Snippets/XHTML <script>.plist	
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>&lt;script type="text/javascript" charset="utf-8"&gt;
-	$0
-&lt;/script&gt;</string>
-	<key>name</key>
-	<string>Script</string>
-	<key>scope</key>
-	<string>text.html</string>
-	<key>tabTrigger</key>
-	<string>script</string>
-	<key>uuid</key>
-	<string>6592050A-A087-11D9-A5A2-000D93C8BE28</string>
-</dict>
-</plist>
diff --git a/bundles/html.tmbundle/Snippets/XHTML <style>.plist b/bundles/html.tmbundle/Snippets/XHTML <style>.plist
deleted file mode 100644
index 408e2dca5..000000000
--- a/bundles/html.tmbundle/Snippets/XHTML <style>.plist	
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>&lt;style type="text/css" media="screen"&gt;
-	$0
-&lt;/style&gt;</string>
-	<key>name</key>
-	<string>Style</string>
-	<key>scope</key>
-	<string>text.html</string>
-	<key>tabTrigger</key>
-	<string>style</string>
-	<key>uuid</key>
-	<string>3C518074-A088-11D9-A5A2-000D93C8BE28</string>
-</dict>
-</plist>
diff --git a/bundles/html.tmbundle/Snippets/XHTML <table>.plist b/bundles/html.tmbundle/Snippets/XHTML <table>.plist
deleted file mode 100644
index d302b0d3c..000000000
--- a/bundles/html.tmbundle/Snippets/XHTML <table>.plist	
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>&lt;table border="${1:0}"${2: cellspacing="${3:5}" cellpadding="${4:5}"}&gt;
-	&lt;tr&gt;&lt;th&gt;${5:Header}&lt;/th&gt;&lt;/tr&gt;
-	&lt;tr&gt;&lt;td&gt;${0:Data}&lt;/td&gt;&lt;/tr&gt;
-&lt;/table&gt;</string>
-	<key>name</key>
-	<string>Table</string>
-	<key>scope</key>
-	<string>text.html</string>
-	<key>tabTrigger</key>
-	<string>table</string>
-	<key>uuid</key>
-	<string>57176082-A12F-11D9-A5A2-000D93C8BE28</string>
-</dict>
-</plist>
diff --git a/bundles/html.tmbundle/Snippets/XHTML <title>.plist b/bundles/html.tmbundle/Snippets/XHTML <title>.plist
deleted file mode 100644
index 074850a47..000000000
--- a/bundles/html.tmbundle/Snippets/XHTML <title>.plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>&lt;title&gt;${1:${TM_FILENAME/((.+)\..*)?/(?2:$2:Page Title)/}}&lt;/title&gt;</string>
-	<key>name</key>
-	<string>Title</string>
-	<key>scope</key>
-	<string>text.html - text.blog</string>
-	<key>tabTrigger</key>
-	<string>title</string>
-	<key>uuid</key>
-	<string>B62ECABE-A086-11D9-A5A2-000D93C8BE28</string>
-</dict>
-</plist>
diff --git a/bundles/html.tmbundle/Support/entities.txt b/bundles/html.tmbundle/Support/entities.txt
deleted file mode 100644
index 2949b04df..000000000
--- a/bundles/html.tmbundle/Support/entities.txt
+++ /dev/null
@@ -1,252 +0,0 @@
-160	nbsp
-161	iexcl
-162	cent
-163	pound
-164	curren
-165	yen
-166	brvbar
-167	sect
-168	uml
-169	copy
-170	ordf
-171	laquo
-172	not
-173	shy
-174	reg
-175	macr
-176	deg
-177	plusmn
-178	sup2
-179	sup3
-180	acute
-181	micro
-182	para
-183	middot
-184	cedil
-185	sup1
-186	ordm
-187	raquo
-188	frac14
-189	frac12
-190	frac34
-191	iquest
-192	Agrave
-193	Aacute
-194	Acirc
-195	Atilde
-196	Auml
-197	Aring
-198	AElig
-199	Ccedil
-200	Egrave
-201	Eacute
-202	Ecirc
-203	Euml
-204	Igrave
-205	Iacute
-206	Icirc
-207	Iuml
-208	ETH
-209	Ntilde
-210	Ograve
-211	Oacute
-212	Ocirc
-213	Otilde
-214	Ouml
-215	times
-216	Oslash
-217	Ugrave
-218	Uacute
-219	Ucirc
-220	Uuml
-221	Yacute
-222	THORN
-223	szlig
-224	agrave
-225	aacute
-226	acirc
-227	atilde
-228	auml
-229	aring
-230	aelig
-231	ccedil
-232	egrave
-233	eacute
-234	ecirc
-235	euml
-236	igrave
-237	iacute
-238	icirc
-239	iuml
-240	eth
-241	ntilde
-242	ograve
-243	oacute
-244	ocirc
-245	otilde
-246	ouml
-247	divide
-248	oslash
-249	ugrave
-250	uacute
-251	ucirc
-252	uuml
-253	yacute
-254	thorn
-255	yuml
-402	fnof
-913	Alpha
-914	Beta
-915	Gamma
-916	Delta
-917	Epsilon
-918	Zeta
-919	Eta
-920	Theta
-921	Iota
-922	Kappa
-923	Lambda
-924	Mu
-925	Nu
-926	Xi
-927	Omicron
-928	Pi
-929	Rho
-931	Sigma
-932	Tau
-933	Upsilon
-934	Phi
-935	Chi
-936	Psi
-937	Omega
-945	alpha
-946	beta
-947	gamma
-948	delta
-949	epsilon
-950	zeta
-951	eta
-952	theta
-953	iota
-954	kappa
-955	lambda
-956	mu
-957	nu
-958	xi
-959	omicron
-960	pi
-961	rho
-962	sigmaf
-963	sigma
-964	tau
-965	upsilon
-966	phi
-967	chi
-968	psi
-969	omega
-977	thetasym
-978	upsih
-982	piv
-8226	bull
-8230	hellip
-8242	prime
-8243	Prime
-8254	oline
-8260	frasl
-8472	weierp
-8465	image
-8476	real
-8482	trade
-8501	alefsym
-8592	larr
-8593	uarr
-8594	rarr
-8595	darr
-8596	harr
-8629	crarr
-8656	lArr
-8657	uArr
-8658	rArr
-8659	dArr
-8660	hArr
-8704	forall
-8706	part
-8707	exist
-8709	empty
-8711	nabla
-8712	isin
-8713	notin
-8715	ni
-8719	prod
-8721	sum
-8722	minus
-8727	lowast
-8730	radic
-8733	prop
-8734	infin
-8736	ang
-8743	and
-8744	or
-8745	cap
-8746	cup
-8747	int
-8756	there4
-8764	sim
-8773	cong
-8776	asymp
-8800	ne
-8801	equiv
-8804	le
-8805	ge
-8834	sub
-8835	sup
-8836	nsub
-8838	sube
-8839	supe
-8853	oplus
-8855	otimes
-8869	perp
-8901	sdot
-8968	lceil
-8969	rceil
-8970	lfloor
-8971	rfloor
-9001	lang
-9002	rang
-9674	loz
-9824	spades
-9827	clubs
-9829	hearts
-9830	diams
-34	quot
-38	amp
-60	lt
-62	gt
-338	OElig
-339	oelig
-352	Scaron
-353	scaron
-376	Yuml
-710	circ
-732	tilde
-8194	ensp
-8195	emsp
-8201	thinsp
-8204	zwnj
-8205	zwj
-8206	lrm
-8207	rlm
-8211	ndash
-8212	mdash
-8216	lsquo
-8217	rsquo
-8218	sbquo
-8220	ldquo
-8221	rdquo
-8222	bdquo
-8224	dagger
-8225	Dagger
-8240	permil
-8249	lsaquo
-8250	rsaquo
-8364	euro
diff --git a/bundles/html.tmbundle/Support/nibs/Insert Entity.nib/classes.nib b/bundles/html.tmbundle/Support/nibs/Insert Entity.nib/classes.nib
deleted file mode 100644
index a731b330e..000000000
--- a/bundles/html.tmbundle/Support/nibs/Insert Entity.nib/classes.nib	
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    IBClasses = (
-        {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, 
-        {ACTIONS = {performButtonClick = id; }; CLASS = NSObject; LANGUAGE = ObjC; }
-    ); 
-    IBVersion = 1; 
-}
\ No newline at end of file
diff --git a/bundles/html.tmbundle/Support/nibs/Insert Entity.nib/info.nib b/bundles/html.tmbundle/Support/nibs/Insert Entity.nib/info.nib
deleted file mode 100644
index 42c6d2fea..000000000
--- a/bundles/html.tmbundle/Support/nibs/Insert Entity.nib/info.nib	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>IBDocumentLocation</key>
-	<string>69 14 356 240 0 0 1920 1178 </string>
-	<key>IBFramework Version</key>
-	<string>446.1</string>
-	<key>IBOpenObjects</key>
-	<array>
-		<integer>5</integer>
-	</array>
-	<key>IBSystem Version</key>
-	<string>8L127</string>
-</dict>
-</plist>
diff --git a/bundles/html.tmbundle/Support/nibs/Insert Entity.nib/keyedobjects.nib b/bundles/html.tmbundle/Support/nibs/Insert Entity.nib/keyedobjects.nib
deleted file mode 100644
index 2a9ea60514caae50ceddf4a23f3c2cfa19aec25f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 11362
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

diff --git a/bundles/html.tmbundle/Support/tminclude.rb b/bundles/html.tmbundle/Support/tminclude.rb
deleted file mode 100644
index 52e34e9fb..000000000
--- a/bundles/html.tmbundle/Support/tminclude.rb
+++ /dev/null
@@ -1,371 +0,0 @@
-# tminclude.rb
-#
-# An implementation of "Persistent Includes" for TextMate
-# Brad Choate <brad@bradchoate.com> 
-
-require 'singleton'
-
-module TextMate
-  class Includes
-    include Singleton
-
-    def initialize
-      @time = Time.now
-    end
-
-    protected
-
-    def reset
-      @argument_regexp = Regexp.new(/\s*#([^#]+?)#\s*=\s*(?:(["'])([^\2]*?)\2|(\S+))\s*/m).freeze
-      @depth = 1
-      @ctime = nil
-      @mtime = nil
-
-      init_comment_delimiters()
-      init_global_vars()
-    end
-
-    def init_comment_delimiters
-      if ENV['TM_COMMENT_START']
-        @escape_open = (ENV['TM_COMMENT_START'].dup.strip).freeze
-        @escape_close = (ENV['TM_COMMENT_END'] ? ENV['TM_COMMENT_END'].dup.strip : '').freeze
-      else
-        @escape_open = '<!--'.freeze
-        @escape_close = '-->'.freeze
-      end
-
-      # non-capturing for .gsub
-      # <!-- #tminclude "/path/to/file" -->
-      # <!-- #tminclude "/path/to/file" #arg#="value" ... -->
-      if ENV['TM_COMMENT_END']
-        escaped_open = Regexp.escape(@escape_open)
-        escaped_close = Regexp.escape(@escape_close)
-        @tminclude_regexp = %r{#{escaped_open}\s*#(?:tm|bb)include\s.*?#{escaped_close}.+?#{escaped_open}\s*end (?:tm|bb)include\s*#{escaped_close}}im
-        # version that captures for .scan
-        @tminclude_regexp_detail = %r{(#{escaped_open}\s*#(?:tm|bb)include\s+['"]([^'"]+)['"](?:\s+(.*?))?#{escaped_close})(.+?)(#{escaped_open}\s*end (?:tm|bb)include\s*#{escaped_close})}im
-      else
-        escaped_open = Regexp.escape(@escape_open)
-        @tminclude_regexp = %r{#{escaped_open} *#(?:tm|bb)include [^\n]*?\n.*?#{escaped_open} +end (?:tm|bb)include *(\n|$)}im
-        # version that captures for .scan
-        @tminclude_regexp_detail = %r{(#{escaped_open} *#(?:tm|bb)include +['"]([^'"]+)['"](?: +([^\n]*?))?)(\n.*?)(#{escaped_open} +end (?:tm|bb)include *(?:\n|$))}im
-      end
-    end
-
-    def init_global_vars
-      @global_vars = {}
-      # start by setting all the TM_* defined variables
-      ENV.each_pair do | k, v |
-        if k =~ /^TM_(.+)/
-          @global_vars[$1.downcase] = v
-        end
-      end
-      # Here are some of BBEdit's global variables. We may choose
-      # to cherry pick these for support...
-      @global_vars['dont_update'] = ''
-      @global_vars['shortusername'] = ENV['USER']
-      # lazily invoke this one, since it has cost associated with it...
-      @global_vars['username'] = method("var_username")
-
-      @global_vars['localtime'] = method("var_localtime")
-      @global_vars['gmtime'] = method("var_gmtime")
-      @global_vars['longdate'] = @time.strftime("%A, %B %e, %Y").sub(/  /, ' ')
-      @global_vars['compdate'] = @time.strftime("%d-%b-%y")
-      @global_vars['monthnum'] = @time.strftime("%m")
-      @global_vars['monthdaynum'] = @time.strftime("%d")
-      @global_vars['shortdate'] = @time.strftime("%m/%d/%y").gsub(/0(\d\/)/, '\1')
-      @global_vars['abbrevdate'] = @time.strftime("%a, %b %e, %Y").sub(/  /, ' ')
-      @global_vars['yearnum'] = @time.year
-      @global_vars['generator'] = "TextMate"
-
-      init_file_vars(ENV['TM_FILEPATH'])
-
-      if ENV['TM_PROJECT_FILEPATH']
-        dir = ENV['TM_PROJECT_FILEPATH'].dup
-        fdir = ENV['TM_DIRECTORY'].dup
-        dir.sub!(/\/[^\/]+$/, '')
-        dir = Regexp.quote(dir)
-        fdir.sub!(Regexp.new("^" + dir), '')
-        fdir.sub!(/^\//, '')
-        fdir.sub!(/\/$/, '')
-        paths = fdir.split(/\//)
-        @global_vars['relative'] = ("../" * paths.length) || ""
-      end
-
-      # Web Project settings
-      # Site Name (Local Web)
-      # Web Server Name (http://localhost/)
-      # Site Path on Server (/path/to/site)
-      # Default Page Name (index.html)
-      # Local Site Root (~/path/to/site)
-      # Template/Include path (~/path:~/path)
-      # Local Preview URL
-
-      # Unsupported...
-      # base, base_url, charset, dirpath, doctitle, language,
-      # link, machine, meta, path, prefix, real_url, root,
-      # rootpath, server, title
-    end
-
-    def init_file_vars(file)
-      @global_vars['localpath'] = file
-      basename = File.basename(file)
-      @global_vars['filename'] = basename
-      @global_vars['basename'] = basename.sub(/\.\w+$/, '')
-      @global_vars['file_extension'] = File.extname(file)
-
-      if ctime = File.ctime(file)
-        @ctime = ctime
-        @global_vars['creationdate'] = method('var_creationdate')
-        @global_vars['creationtime'] = method('var_creationtime')
-      end
-      if mtime = File.mtime(file)
-        @mtime = mtime
-        @global_vars['modifieddate'] = method('var_modifieddate')
-        @global_vars['modifiedtime'] = method('var_modifiedtime')
-      end
-    end
-
-    def parse_arguments(arg_str, vars)
-      arg_str.scan(@argument_regexp) do | var, quote, val, val2 |
-        vars[var.downcase] = val.nil? ? val2 : val
-      end
-    end
-
-    def replace_variables(content, vars)
-      content.gsub(/(#\w+(?:\s+[^#]+?)?#)/m) do | expr |
-        # normalize variable... strip '#' prefix/suffix/parameter, downcase
-        var = expr.gsub(/^\#|\#$/, '')
-        if var =~ / +(.+)/
-          attribute = $1
-          var.sub!(/ .+/, '')
-        else
-          attribute = nil
-        end
-        var.downcase!
-        out = vars[var] || @global_vars[var] || expr
-        if out.kind_of?(Method)
-          case out.arity
-            when 0
-              out.call
-            when 1
-              out.call(attribute)
-            when -1
-              attribute.nil? ? out.call : out.call(attribute)
-            else
-              expr
-          end
-        else
-          out
-        end
-      end
-    end
-
-    def invoke_interpreter(file, vars)
-      require "#{ENV['TM_SUPPORT_PATH']}/lib/escape.rb"
-      # run interpreter using file and requested arguments
-      filepath = e_sh(ENV['TM_FILEPATH'] || '/dev/null')
-      argstr = ''
-      vars.each_pair { | k, v | argstr << " " << e_sh(k) << " " << e_sh(v) }
-      %x{#{e_sh file} #{filepath}#{argstr}};
-    end
-
-    def process_include(file, args, vars)
-      @doc_stack ||= Hash.new
-
-      local_vars = vars.dup
-      @depth += 1
-
-      content = nil
-
-      # File resolution; expand ~/... paths;
-      # look for relative files, relative to current file, current project, replace variables
-      file = replace_variables(file, local_vars)
-      file_dir = File.dirname(ENV['TM_FILEPATH'])
-      if File.exist?(filepath = File.expand_path(file))
-      elsif file.match(/^\//) # non-relative path...
-        raise Exception, "Could not find file: #{file}"
-      elsif File.exist?(filepath = "#{file_dir}/#{file}")
-      else
-        raise Exception, "Could not find file: #{file}"
-      end
-
-      file = filepath
-
-      if @doc_stack.has_key?(file)
-        raise Exception, "Error: recursive include for #{file}"
-      end
-
-      @doc_stack[file] = true
-
-      parse_arguments(args, local_vars) unless args.nil?
-      if File.executable?(file) and file.match(/\.(pl|rb|py)$/)
-        content = invoke_interpreter(file, local_vars)
-      else
-        content = IO.readlines(file).join
-      end
-      replace_variables(content, local_vars)
-      if content.scan(@tminclude_regexp)
-        content = process_document(content, local_vars)
-      end
-
-      @doc_stack.delete(file)
-
-      @depth -= 1
-      content
-    end
-
-    # Dynamic variables
-
-    def var_creationtime(format = "%l:%M %p")
-      @ctime ? @ctime.strftime(format) : nil
-    end
-
-    def var_creationdate(format = "%d-%b-%y")
-      @ctime ? @ctime.strftime(format) : nil
-    end
-
-    def var_modifiedtime(format = "%l:%M %p")
-      @mtime ? @mtime.strftime(format) : nil
-    end
-
-    def var_modifieddate(format = "%d-%b-%y")
-      @mtime ? @mtime.strftime(format) : nil
-    end
-
-    def var_localtime(format = "%c")
-      @time.strftime(format)
-    end
-
-    def var_gmtime(format = "%c")
-      @time.gmtime.strftime(format)
-    end
-
-    def var_username
-      # store the username into the variable stash so we don't have
-      # to do this again...
-      @global_vars['username'] = ENV['TM_FULLNAME']
-    end
-
-    def process_document(doc, vars)
-      # process blocks that look like this:
-      # <!-- #tminclude "/path/to/file" -->
-      # <!-- end tminclude -->
-      # and this...
-      # <!-- #tminclude "/path/to/file" #param#="value" #param2#="value" -->
-      # <!-- end tminclude -->
-      doc.gsub!(@tminclude_regexp) do | match |
-        result = match
-        match.scan(@tminclude_regexp_detail) do | open, file, args, incl, close |
-          if @depth == 1
-            result = "#{open}\n#{process_include(file, args, vars)}\n#{close}"
-          else
-            result = "#{process_include(file, args, vars)}"
-          end
-        end
-        result
-      end
-      replace_variables(doc, vars)
-    end
-
-    def process_persistent_includes_for_string(doc)
-      vars = {}
-      process_document(doc, vars)
-
-      # lastly, process '#docsize#'
-      # TBD: support for reporting document size in kb, mb, etc.
-      # TBD: support for image sizes as well.
-      matches = doc.scan(/#docsize#/i)
-      if matches.length
-        # baselen is document without any "#docsize#" elements
-        baselen = doc.length - '#docsize#'.length * matches.length
-        # newlen is document with added docsize values
-        newlen = baselen + baselen.to_s.length * matches.length
-        # sometimes this adjustment causes the length of the document
-        # to change again, so check for that.
-        while baselen + (newlen.to_s.length * matches.length) != newlen
-          newlen = baselen + (newlen.to_s.length * matches.length)
-        end
-        doc.gsub!(/#docsize#/i, newlen.to_s)
-      end
-    end
-
-    public
-
-    def process_persistent_includes_for_project
-      require "#{ENV['TM_SUPPORT_PATH']}/lib/textmate.rb"
-      count = 0
-      begin
-        TextMate.each_text_file do | file |
-          doc = IO.readlines(file).join
-          if doc.match(/#(tm|bb)include/)
-            if not doc.match(/#dont_update#/)
-              ENV['TM_FILEPATH'] = file
-              ENV['TM_DIRECTORY'] = File.dirname(file)
-              reset
-              newdoc = doc.dup
-              process_persistent_includes_for_string(newdoc)
-              if newdoc != doc
-                if File.writable?(file)
-                  f = File.new(file, "w")
-                  f.write(newdoc)
-                  f.close
-                  count += 1
-                end
-              end
-            end
-          end
-        end
-      rescue Exception => e
-        print e
-        exit 206
-      end
-      if count == 1
-        print "1 file updated"
-        TextMate.rescan_project
-      elsif count > 1
-        print "#{count} files updated"
-        TextMate.rescan_project
-      else
-        print "No files needed an update"
-      end
-      exit 206
-    end
-
-    def process_persistent_includes
-      #initialize
-      reset
-
-      doc = STDIN.readlines.join
-      if doc =~ /\#dont_update\#/
-        print "This document cannot be updated because it is protected."
-        exit 206
-      end
-      begin
-        process_persistent_includes_for_string(doc)
-      rescue Exception => e
-        print e
-        exit 206
-      end
-      print doc
-    end
-
-    def include_command
-      #initialize
-      init_comment_delimiters()
-
-      require "#{ENV['TM_SUPPORT_PATH']}/lib/ui.rb"
-      cstart = (@escape_open).rstrip + ' '
-      cend = (' ' + @escape_close).rstrip
-      begin
-        TextMate::UI.request_file do | file |
-          print <<-"EOT"
-#{cstart}#tminclude "#{file}"#{cend}
-#{cstart}end tminclude#{cend}
-EOT
-        end
-      rescue SystemExit
-        exit 200
-      end
-    end
-  end
-end
diff --git a/bundles/html.tmbundle/Syntaxes/HTML.plist b/bundles/html.tmbundle/Syntaxes/HTML.plist
deleted file mode 100644
index 8c637216c..000000000
--- a/bundles/html.tmbundle/Syntaxes/HTML.plist
+++ /dev/null
@@ -1,841 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>fileTypes</key>
-	<array>
-		<string>html</string>
-		<string>htm</string>
-		<string>shtml</string>
-		<string>xhtml</string>
-		<string>inc</string>
-		<string>tmpl</string>
-		<string>tpl</string>
-	</array>
-	<key>firstLineMatch</key>
-	<string>&lt;(?i:(!DOCTYPE\s*)?html)</string>
-	<key>injections</key>
-	<dict>
-		<key>text.html.basic - comment.block</key>
-		<dict>
-			<key>comment</key>
-			<string>Match this via injection so it doesnt match in other grammars.</string>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>match</key>
-					<string>&lt;</string>
-					<key>name</key>
-					<string>invalid.illegal.bad-angle-bracket.html</string>
-				</dict>
-			</array>
-		</dict>
-	</dict>
-	<key>keyEquivalent</key>
-	<string>^~H</string>
-	<key>name</key>
-	<string>HTML</string>
-	<key>patterns</key>
-	<array>
-		<dict>
-			<key>begin</key>
-			<string>(&lt;)([a-zA-Z0-9:]++)(?=[^&gt;]*&gt;&lt;/\2&gt;)</string>
-			<key>beginCaptures</key>
-			<dict>
-				<key>1</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.tag.html</string>
-				</dict>
-				<key>2</key>
-				<dict>
-					<key>name</key>
-					<string>entity.name.tag.html</string>
-				</dict>
-			</dict>
-			<key>end</key>
-			<string>(&gt;(&lt;)/)(\2)(&gt;)</string>
-			<key>endCaptures</key>
-			<dict>
-				<key>1</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.tag.html</string>
-				</dict>
-				<key>2</key>
-				<dict>
-					<key>name</key>
-					<string>meta.scope.between-tag-pair.html</string>
-				</dict>
-				<key>3</key>
-				<dict>
-					<key>name</key>
-					<string>entity.name.tag.html</string>
-				</dict>
-				<key>4</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.tag.html</string>
-				</dict>
-			</dict>
-			<key>name</key>
-			<string>meta.tag.any.html</string>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>include</key>
-					<string>#tag-stuff</string>
-				</dict>
-			</array>
-		</dict>
-		<dict>
-			<key>begin</key>
-			<string>(&lt;\?)(xml)</string>
-			<key>captures</key>
-			<dict>
-				<key>1</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.tag.html</string>
-				</dict>
-				<key>2</key>
-				<dict>
-					<key>name</key>
-					<string>entity.name.tag.xml.html</string>
-				</dict>
-			</dict>
-			<key>end</key>
-			<string>(\?&gt;)</string>
-			<key>name</key>
-			<string>meta.tag.preprocessor.xml.html</string>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>include</key>
-					<string>#tag-generic-attribute</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>#string-double-quoted</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>#string-single-quoted</string>
-				</dict>
-			</array>
-		</dict>
-		<dict>
-			<key>begin</key>
-			<string>&lt;!--</string>
-			<key>captures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.comment.html</string>
-				</dict>
-			</dict>
-			<key>end</key>
-			<string>--\s*&gt;</string>
-			<key>name</key>
-			<string>comment.block.html</string>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>match</key>
-					<string>--</string>
-					<key>name</key>
-					<string>invalid.illegal.bad-comments-or-CDATA.html</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>#embedded-code</string>
-				</dict>
-			</array>
-		</dict>
-		<dict>
-			<key>begin</key>
-			<string>&lt;!</string>
-			<key>captures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.tag.html</string>
-				</dict>
-			</dict>
-			<key>end</key>
-			<string>&gt;</string>
-			<key>name</key>
-			<string>meta.tag.sgml.html</string>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>begin</key>
-					<string>(?i:DOCTYPE)</string>
-					<key>captures</key>
-					<dict>
-						<key>1</key>
-						<dict>
-							<key>name</key>
-							<string>entity.name.tag.doctype.html</string>
-						</dict>
-					</dict>
-					<key>end</key>
-					<string>(?=&gt;)</string>
-					<key>name</key>
-					<string>meta.tag.sgml.doctype.html</string>
-					<key>patterns</key>
-					<array>
-						<dict>
-							<key>match</key>
-							<string>"[^"&gt;]*"</string>
-							<key>name</key>
-							<string>string.quoted.double.doctype.identifiers-and-DTDs.html</string>
-						</dict>
-					</array>
-				</dict>
-				<dict>
-					<key>begin</key>
-					<string>\[CDATA\[</string>
-					<key>end</key>
-					<string>]](?=&gt;)</string>
-					<key>name</key>
-					<string>constant.other.inline-data.html</string>
-				</dict>
-				<dict>
-					<key>match</key>
-					<string>(\s*)(?!--|&gt;)\S(\s*)</string>
-					<key>name</key>
-					<string>invalid.illegal.bad-comments-or-CDATA.html</string>
-				</dict>
-			</array>
-		</dict>
-		<dict>
-			<key>include</key>
-			<string>#embedded-code</string>
-		</dict>
-		<dict>
-			<key>begin</key>
-			<string>(?:^\s+)?(&lt;)((?i:style))\b(?![^&gt;]*/&gt;)</string>
-			<key>captures</key>
-			<dict>
-				<key>1</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.tag.html</string>
-				</dict>
-				<key>2</key>
-				<dict>
-					<key>name</key>
-					<string>entity.name.tag.style.html</string>
-				</dict>
-				<key>3</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.tag.html</string>
-				</dict>
-			</dict>
-			<key>end</key>
-			<string>(&lt;/)((?i:style))(&gt;)(?:\s*\n)?</string>
-			<key>name</key>
-			<string>source.css.embedded.html</string>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>include</key>
-					<string>#tag-stuff</string>
-				</dict>
-				<dict>
-					<key>begin</key>
-					<string>(&gt;)</string>
-					<key>beginCaptures</key>
-					<dict>
-						<key>1</key>
-						<dict>
-							<key>name</key>
-							<string>punctuation.definition.tag.html</string>
-						</dict>
-					</dict>
-					<key>end</key>
-					<string>(?=&lt;/(?i:style))</string>
-					<key>patterns</key>
-					<array>
-						<dict>
-							<key>include</key>
-							<string>#embedded-code</string>
-						</dict>
-						<dict>
-							<key>include</key>
-							<string>source.css</string>
-						</dict>
-					</array>
-				</dict>
-			</array>
-		</dict>
-		<dict>
-			<key>begin</key>
-			<string>(?:^\s+)?(&lt;)((?i:script))\b(?![^&gt;]*/&gt;)</string>
-			<key>beginCaptures</key>
-			<dict>
-				<key>1</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.tag.html</string>
-				</dict>
-				<key>2</key>
-				<dict>
-					<key>name</key>
-					<string>entity.name.tag.script.html</string>
-				</dict>
-			</dict>
-			<key>end</key>
-			<string>(?&lt;=&lt;/(script|SCRIPT))(&gt;)(?:\s*\n)?</string>
-			<key>endCaptures</key>
-			<dict>
-				<key>2</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.tag.html</string>
-				</dict>
-			</dict>
-			<key>name</key>
-			<string>source.js.embedded.html</string>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>include</key>
-					<string>#tag-stuff</string>
-				</dict>
-				<dict>
-					<key>begin</key>
-					<string>(?&lt;!&lt;/(?:script|SCRIPT))(&gt;)</string>
-					<key>captures</key>
-					<dict>
-						<key>1</key>
-						<dict>
-							<key>name</key>
-							<string>punctuation.definition.tag.html</string>
-						</dict>
-						<key>2</key>
-						<dict>
-							<key>name</key>
-							<string>entity.name.tag.script.html</string>
-						</dict>
-					</dict>
-					<key>end</key>
-					<string>(&lt;/)((?i:script))</string>
-					<key>patterns</key>
-					<array>
-						<dict>
-							<key>captures</key>
-							<dict>
-								<key>1</key>
-								<dict>
-									<key>name</key>
-									<string>punctuation.definition.comment.js</string>
-								</dict>
-							</dict>
-							<key>match</key>
-							<string>(//).*?((?=&lt;/script)|$\n?)</string>
-							<key>name</key>
-							<string>comment.line.double-slash.js</string>
-						</dict>
-						<dict>
-							<key>begin</key>
-							<string>/\*</string>
-							<key>captures</key>
-							<dict>
-								<key>0</key>
-								<dict>
-									<key>name</key>
-									<string>punctuation.definition.comment.js</string>
-								</dict>
-							</dict>
-							<key>end</key>
-							<string>\*/|(?=&lt;/script)</string>
-							<key>name</key>
-							<string>comment.block.js</string>
-						</dict>
-						<dict>
-							<key>include</key>
-							<string>source.js</string>
-						</dict>
-					</array>
-				</dict>
-			</array>
-		</dict>
-		<dict>
-			<key>begin</key>
-			<string>(&lt;/?)((?i:body|head|html)\b)</string>
-			<key>captures</key>
-			<dict>
-				<key>1</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.tag.html</string>
-				</dict>
-				<key>2</key>
-				<dict>
-					<key>name</key>
-					<string>entity.name.tag.structure.any.html</string>
-				</dict>
-			</dict>
-			<key>end</key>
-			<string>(&gt;)</string>
-			<key>name</key>
-			<string>meta.tag.structure.any.html</string>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>include</key>
-					<string>#tag-stuff</string>
-				</dict>
-			</array>
-		</dict>
-		<dict>
-			<key>begin</key>
-			<string>(&lt;/?)((?i:address|blockquote|dd|div|section|article|aside|header|footer|nav|menu|dl|dt|fieldset|form|frame|frameset|h1|h2|h3|h4|h5|h6|iframe|noframes|object|ol|p|ul|applet|center|dir|hr|pre)\b)</string>
-			<key>beginCaptures</key>
-			<dict>
-				<key>1</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.tag.begin.html</string>
-				</dict>
-				<key>2</key>
-				<dict>
-					<key>name</key>
-					<string>entity.name.tag.block.any.html</string>
-				</dict>
-			</dict>
-			<key>end</key>
-			<string>(&gt;)</string>
-			<key>endCaptures</key>
-			<dict>
-				<key>1</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.tag.end.html</string>
-				</dict>
-			</dict>
-			<key>name</key>
-			<string>meta.tag.block.any.html</string>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>include</key>
-					<string>#tag-stuff</string>
-				</dict>
-			</array>
-		</dict>
-		<dict>
-			<key>begin</key>
-			<string>(&lt;/?)((?i:a|abbr|acronym|area|b|base|basefont|bdo|big|br|button|caption|cite|code|col|colgroup|del|dfn|em|font|head|html|i|img|input|ins|isindex|kbd|label|legend|li|link|map|meta|noscript|optgroup|option|param|q|s|samp|script|select|small|span|strike|strong|style|sub|sup|table|tbody|td|textarea|tfoot|th|thead|title|tr|tt|u|var)\b)</string>
-			<key>beginCaptures</key>
-			<dict>
-				<key>1</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.tag.begin.html</string>
-				</dict>
-				<key>2</key>
-				<dict>
-					<key>name</key>
-					<string>entity.name.tag.inline.any.html</string>
-				</dict>
-			</dict>
-			<key>end</key>
-			<string>((?: ?/)?&gt;)</string>
-			<key>endCaptures</key>
-			<dict>
-				<key>1</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.tag.end.html</string>
-				</dict>
-			</dict>
-			<key>name</key>
-			<string>meta.tag.inline.any.html</string>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>include</key>
-					<string>#tag-stuff</string>
-				</dict>
-			</array>
-		</dict>
-		<dict>
-			<key>begin</key>
-			<string>(&lt;/?)([a-zA-Z0-9:]+)</string>
-			<key>beginCaptures</key>
-			<dict>
-				<key>1</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.tag.begin.html</string>
-				</dict>
-				<key>2</key>
-				<dict>
-					<key>name</key>
-					<string>entity.name.tag.other.html</string>
-				</dict>
-			</dict>
-			<key>end</key>
-			<string>(&gt;)</string>
-			<key>endCaptures</key>
-			<dict>
-				<key>1</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.tag.end.html</string>
-				</dict>
-			</dict>
-			<key>name</key>
-			<string>meta.tag.other.html</string>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>include</key>
-					<string>#tag-stuff</string>
-				</dict>
-			</array>
-		</dict>
-		<dict>
-			<key>include</key>
-			<string>#entities</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>&lt;&gt;</string>
-			<key>name</key>
-			<string>invalid.illegal.incomplete.html</string>
-		</dict>
-	</array>
-	<key>repository</key>
-	<dict>
-		<key>embedded-code</key>
-		<dict>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>include</key>
-					<string>#smarty</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>#python</string>
-				</dict>
-			</array>
-		</dict>
-		<key>entities</key>
-		<dict>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>captures</key>
-					<dict>
-						<key>1</key>
-						<dict>
-							<key>name</key>
-							<string>punctuation.definition.entity.html</string>
-						</dict>
-						<key>3</key>
-						<dict>
-							<key>name</key>
-							<string>punctuation.definition.entity.html</string>
-						</dict>
-					</dict>
-					<key>match</key>
-					<string>(&amp;)([a-zA-Z0-9]+|#[0-9]+|#x[0-9a-fA-F]+)(;)</string>
-					<key>name</key>
-					<string>constant.character.entity.html</string>
-				</dict>
-				<dict>
-					<key>match</key>
-					<string>&amp;</string>
-					<key>name</key>
-					<string>invalid.illegal.bad-ampersand.html</string>
-				</dict>
-			</array>
-		</dict>
-		<key>python</key>
-		<dict>
-			<key>begin</key>
-			<string>(?:^\s*)&lt;\?python(?!.*\?&gt;)</string>
-			<key>end</key>
-			<string>\?&gt;(?:\s*$\n)?</string>
-			<key>name</key>
-			<string>source.python.embedded.html</string>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>include</key>
-					<string>source.python</string>
-				</dict>
-			</array>
-		</dict>
-		<key>smarty</key>
-		<dict>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>begin</key>
-					<string>(\{(literal)\})</string>
-					<key>captures</key>
-					<dict>
-						<key>1</key>
-						<dict>
-							<key>name</key>
-							<string>source.smarty.embedded.html</string>
-						</dict>
-						<key>2</key>
-						<dict>
-							<key>name</key>
-							<string>support.function.built-in.smarty</string>
-						</dict>
-					</dict>
-					<key>end</key>
-					<string>(\{/(literal)\})</string>
-				</dict>
-				<dict>
-					<key>begin</key>
-					<string>{{|{</string>
-					<key>disabled</key>
-					<integer>1</integer>
-					<key>end</key>
-					<string>}}|}</string>
-					<key>name</key>
-					<string>source.smarty.embedded.html</string>
-					<key>patterns</key>
-					<array>
-						<dict>
-							<key>include</key>
-							<string>source.smarty</string>
-						</dict>
-					</array>
-				</dict>
-			</array>
-		</dict>
-		<key>string-double-quoted</key>
-		<dict>
-			<key>begin</key>
-			<string>"</string>
-			<key>beginCaptures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.begin.html</string>
-				</dict>
-			</dict>
-			<key>end</key>
-			<string>"</string>
-			<key>endCaptures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.end.html</string>
-				</dict>
-			</dict>
-			<key>name</key>
-			<string>string.quoted.double.html</string>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>include</key>
-					<string>#embedded-code</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>#entities</string>
-				</dict>
-			</array>
-		</dict>
-		<key>string-single-quoted</key>
-		<dict>
-			<key>begin</key>
-			<string>'</string>
-			<key>beginCaptures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.begin.html</string>
-				</dict>
-			</dict>
-			<key>end</key>
-			<string>'</string>
-			<key>endCaptures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.end.html</string>
-				</dict>
-			</dict>
-			<key>name</key>
-			<string>string.quoted.single.html</string>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>include</key>
-					<string>#embedded-code</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>#entities</string>
-				</dict>
-			</array>
-		</dict>
-		<key>tag-generic-attribute</key>
-		<dict>
-			<key>match</key>
-			<string>(?&lt;=[^=])\b([a-zA-Z0-9:-]+)</string>
-			<key>name</key>
-			<string>entity.other.attribute-name.html</string>
-		</dict>
-		<key>tag-id-attribute</key>
-		<dict>
-			<key>begin</key>
-			<string>\b(id)\b\s*(=)</string>
-			<key>captures</key>
-			<dict>
-				<key>1</key>
-				<dict>
-					<key>name</key>
-					<string>entity.other.attribute-name.id.html</string>
-				</dict>
-				<key>2</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.separator.key-value.html</string>
-				</dict>
-			</dict>
-			<key>end</key>
-			<string>(?&lt;='|")</string>
-			<key>name</key>
-			<string>meta.attribute-with-value.id.html</string>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>begin</key>
-					<string>"</string>
-					<key>beginCaptures</key>
-					<dict>
-						<key>0</key>
-						<dict>
-							<key>name</key>
-							<string>punctuation.definition.string.begin.html</string>
-						</dict>
-					</dict>
-					<key>contentName</key>
-					<string>meta.toc-list.id.html</string>
-					<key>end</key>
-					<string>"</string>
-					<key>endCaptures</key>
-					<dict>
-						<key>0</key>
-						<dict>
-							<key>name</key>
-							<string>punctuation.definition.string.end.html</string>
-						</dict>
-					</dict>
-					<key>name</key>
-					<string>string.quoted.double.html</string>
-					<key>patterns</key>
-					<array>
-						<dict>
-							<key>include</key>
-							<string>#embedded-code</string>
-						</dict>
-						<dict>
-							<key>include</key>
-							<string>#entities</string>
-						</dict>
-					</array>
-				</dict>
-				<dict>
-					<key>begin</key>
-					<string>'</string>
-					<key>beginCaptures</key>
-					<dict>
-						<key>0</key>
-						<dict>
-							<key>name</key>
-							<string>punctuation.definition.string.begin.html</string>
-						</dict>
-					</dict>
-					<key>contentName</key>
-					<string>meta.toc-list.id.html</string>
-					<key>end</key>
-					<string>'</string>
-					<key>endCaptures</key>
-					<dict>
-						<key>0</key>
-						<dict>
-							<key>name</key>
-							<string>punctuation.definition.string.end.html</string>
-						</dict>
-					</dict>
-					<key>name</key>
-					<string>string.quoted.single.html</string>
-					<key>patterns</key>
-					<array>
-						<dict>
-							<key>include</key>
-							<string>#embedded-code</string>
-						</dict>
-						<dict>
-							<key>include</key>
-							<string>#entities</string>
-						</dict>
-					</array>
-				</dict>
-			</array>
-		</dict>
-		<key>tag-stuff</key>
-		<dict>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>include</key>
-					<string>#tag-id-attribute</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>#tag-generic-attribute</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>#string-double-quoted</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>#string-single-quoted</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>#embedded-code</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>#unquoted-attribute</string>
-				</dict>
-			</array>
-		</dict>
-		<key>unquoted-attribute</key>
-		<dict>
-			<key>match</key>
-			<string>(?&lt;==)(?:[^\s&lt;&gt;/'"]|/(?!&gt;))+</string>
-			<key>name</key>
-			<string>string.unquoted.html</string>
-		</dict>
-	</dict>
-	<key>scopeName</key>
-	<string>text.html.basic</string>
-	<key>uuid</key>
-	<string>17994EC8-6B1D-11D9-AC3A-000D93589AF6</string>
-</dict>
-</plist>
diff --git a/bundles/html.tmbundle/Templates/HTML – 4.0 Strict/index.html b/bundles/html.tmbundle/Templates/HTML – 4.0 Strict/index.html
deleted file mode 100644
index eec35154a..000000000
--- a/bundles/html.tmbundle/Templates/HTML – 4.0 Strict/index.html	
+++ /dev/null
@@ -1,15 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"
-   "http://www.w3.org/TR/html4/strict.dtd">
-
-<html lang="en">
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-	<title>${TM_NEW_FILE_BASENAME}</title>
-	<meta name="generator" content="TextMate http://macromates.com/">
-	<meta name="author" content="${TM_FULLNAME}">
-	<!-- Date: ${TM_DATE} -->
-</head>
-<body>
-
-</body>
-</html>
diff --git a/bundles/html.tmbundle/Templates/HTML – 4.0 Strict/info.plist b/bundles/html.tmbundle/Templates/HTML – 4.0 Strict/info.plist
deleted file mode 100644
index 7f0d763ec..000000000
--- a/bundles/html.tmbundle/Templates/HTML – 4.0 Strict/info.plist	
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>command</key>
-	<string>if [[ ! -f "$TM_NEW_FILE" ]]; then
-   TM_DATE=`date +%Y-%m-%d` \
-   perl -pe 's/\$\{([^}]*)\}/$ENV{$1}/g' \
-      &lt; index.html &gt; "$TM_NEW_FILE"
-fi</string>
-	<key>extension</key>
-	<string>html</string>
-	<key>name</key>
-	<string>HTML — 4.01 Strict</string>
-	<key>scope</key>
-	<string>text.html</string>
-	<key>uuid</key>
-	<string>04332FA8-8157-46C4-9854-8C190FFD96C6</string>
-</dict>
-</plist>
diff --git a/bundles/html.tmbundle/Templates/HTML — 4.0 Transitional/index.html b/bundles/html.tmbundle/Templates/HTML — 4.0 Transitional/index.html
deleted file mode 100644
index 8c6b942ea..000000000
--- a/bundles/html.tmbundle/Templates/HTML — 4.0 Transitional/index.html	
+++ /dev/null
@@ -1,15 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-   "http://www.w3.org/TR/html4/loose.dtd">
-
-<html lang="en">
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-	<title>${TM_NEW_FILE_BASENAME}</title>
-	<meta name="generator" content="TextMate http://macromates.com/">
-	<meta name="author" content="${TM_FULLNAME}">
-	<!-- Date: ${TM_DATE} -->
-</head>
-<body>
-
-</body>
-</html>
diff --git a/bundles/html.tmbundle/Templates/HTML — 4.0 Transitional/info.plist b/bundles/html.tmbundle/Templates/HTML — 4.0 Transitional/info.plist
deleted file mode 100644
index dc58770fa..000000000
--- a/bundles/html.tmbundle/Templates/HTML — 4.0 Transitional/info.plist	
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>command</key>
-	<string>if [[ ! -f "$TM_NEW_FILE" ]]; then
-   TM_DATE=`date +%Y-%m-%d` \
-   perl -pe 's/\$\{([^}]*)\}/$ENV{$1}/g' \
-      &lt; index.html &gt; "$TM_NEW_FILE"
-fi</string>
-	<key>extension</key>
-	<string>html</string>
-	<key>name</key>
-	<string>HTML — 4.01 Transitional</string>
-	<key>scope</key>
-	<string>text.html</string>
-	<key>uuid</key>
-	<string>E6F19171-F664-4B4F-92DA-3E15E6CAD35C</string>
-</dict>
-</plist>
diff --git a/bundles/html.tmbundle/Templates/XHTML – 1.0 Frameset/index.html b/bundles/html.tmbundle/Templates/XHTML – 1.0 Frameset/index.html
deleted file mode 100644
index a4065e5a0..000000000
--- a/bundles/html.tmbundle/Templates/XHTML – 1.0 Frameset/index.html	
+++ /dev/null
@@ -1,16 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN"
-	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-
-	<title>${TM_NEW_FILE_BASENAME}</title>
-	
-</head>
-
-<frameset>
-
-
-</frameset>
-</html>
diff --git a/bundles/html.tmbundle/Templates/XHTML – 1.0 Frameset/info.plist b/bundles/html.tmbundle/Templates/XHTML – 1.0 Frameset/info.plist
deleted file mode 100644
index 6ef1bedc7..000000000
--- a/bundles/html.tmbundle/Templates/XHTML – 1.0 Frameset/info.plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>command</key>
-	<string>[ -f "$TM_NEW_FILE" ] ||  perl -pe 's/\$\{([^}]*)\}/$ENV{$1}/g' &lt;index.html &gt;"$TM_NEW_FILE"</string>
-	<key>extension</key>
-	<string>html</string>
-	<key>name</key>
-	<string>XHTML — 1.0 Frameset</string>
-	<key>scope</key>
-	<string>text.html</string>
-	<key>uuid</key>
-	<string>26068A55-4C84-409D-BA00-162B55AF6961</string>
-</dict>
-</plist>
diff --git a/bundles/html.tmbundle/Templates/XHTML – 1.0 Strict/index.html b/bundles/html.tmbundle/Templates/XHTML – 1.0 Strict/index.html
deleted file mode 100644
index 666c4ff82..000000000
--- a/bundles/html.tmbundle/Templates/XHTML – 1.0 Strict/index.html	
+++ /dev/null
@@ -1,16 +0,0 @@
-<!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>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-
-	<title>${TM_NEW_FILE_BASENAME}</title>
-	
-</head>
-
-<body>
-
-
-</body>
-</html>
diff --git a/bundles/html.tmbundle/Templates/XHTML – 1.0 Strict/info.plist b/bundles/html.tmbundle/Templates/XHTML – 1.0 Strict/info.plist
deleted file mode 100644
index 2ed8e5405..000000000
--- a/bundles/html.tmbundle/Templates/XHTML – 1.0 Strict/info.plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>command</key>
-	<string>[ -f "$TM_NEW_FILE" ] ||  perl -pe 's/\$\{([^}]*)\}/$ENV{$1}/g' &lt;index.html &gt;"$TM_NEW_FILE"</string>
-	<key>extension</key>
-	<string>html</string>
-	<key>name</key>
-	<string>XHTML — 1.0 Strict</string>
-	<key>scope</key>
-	<string>text.html</string>
-	<key>uuid</key>
-	<string>EBEE6B51-29C7-4362-818F-A190CACD5296</string>
-</dict>
-</plist>
diff --git a/bundles/html.tmbundle/Templates/XHTML – 1.0 Transitional/index.html b/bundles/html.tmbundle/Templates/XHTML – 1.0 Transitional/index.html
deleted file mode 100644
index 5ce6d0c7a..000000000
--- a/bundles/html.tmbundle/Templates/XHTML – 1.0 Transitional/index.html	
+++ /dev/null
@@ -1,16 +0,0 @@
-<!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" xml:lang="en" lang="en">
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-
-	<title>${TM_NEW_FILE_BASENAME}</title>
-	
-</head>
-
-<body>
-
-
-</body>
-</html>
diff --git a/bundles/html.tmbundle/Templates/XHTML – 1.0 Transitional/info.plist b/bundles/html.tmbundle/Templates/XHTML – 1.0 Transitional/info.plist
deleted file mode 100644
index 6c7d8cf1d..000000000
--- a/bundles/html.tmbundle/Templates/XHTML – 1.0 Transitional/info.plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>command</key>
-	<string>[ -f "$TM_NEW_FILE" ] ||  perl -pe 's/\$\{([^}]*)\}/$ENV{$1}/g' &lt;index.html &gt;"$TM_NEW_FILE"</string>
-	<key>extension</key>
-	<string>html</string>
-	<key>name</key>
-	<string>XHTML — 1.0 Transitional</string>
-	<key>scope</key>
-	<string>text.html</string>
-	<key>uuid</key>
-	<string>65D38039-6B0A-48E9-9E49-43832ECC4107</string>
-</dict>
-</plist>
diff --git a/bundles/html.tmbundle/Templates/XHTML – 1.1/index.html b/bundles/html.tmbundle/Templates/XHTML – 1.1/index.html
deleted file mode 100644
index 4f599bef3..000000000
--- a/bundles/html.tmbundle/Templates/XHTML – 1.1/index.html	
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
-	"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-<head>
-	<title>${TM_NEW_FILE_BASENAME}</title>
-	
-</head>
-
-<body>
-
-
-</body>
-</html>
diff --git a/bundles/html.tmbundle/Templates/XHTML – 1.1/info.plist b/bundles/html.tmbundle/Templates/XHTML – 1.1/info.plist
deleted file mode 100644
index f508ccbd5..000000000
--- a/bundles/html.tmbundle/Templates/XHTML – 1.1/info.plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>command</key>
-	<string>[ -f "$TM_NEW_FILE" ] ||  perl -pe 's/\$\{([^}]*)\}/$ENV{$1}/g' &lt;index.html &gt;"$TM_NEW_FILE"</string>
-	<key>extension</key>
-	<string>html</string>
-	<key>name</key>
-	<string>XHTML — 1.1</string>
-	<key>scope</key>
-	<string>text.html</string>
-	<key>uuid</key>
-	<string>CDE8EFD6-9DE2-4E8C-BB6A-52E8CCD2E977</string>
-</dict>
-</plist>
diff --git a/bundles/html.tmbundle/info.plist b/bundles/html.tmbundle/info.plist
deleted file mode 100644
index 55122e94c..000000000
--- a/bundles/html.tmbundle/info.plist
+++ /dev/null
@@ -1,299 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>contactEmailRot13</key>
-	<string>gz-ohaqyrf@znpebzngrf.pbz</string>
-	<key>contactName</key>
-	<string>Allan Odgaard</string>
-	<key>deleted</key>
-	<array>
-		<string>A3F61746-DF95-4461-8EA6-90AE03DA7564</string>
-		<string>44F60595-F6BC-42BB-94B8-DF0FE455A283</string>
-		<string>C71F0AF6-F63E-4003-B499-FAC895AC498D</string>
-	</array>
-	<key>description</key>
-	<string>Support for the &lt;a href="http://www.w3.org/MarkUp/"&gt;Hypertext Markup Language&lt;/a&gt;.</string>
-	<key>mainMenu</key>
-	<dict>
-		<key>excludedItems</key>
-		<array>
-			<string>7B7E945E-A112-11D9-A5A2-000D93C8BE28</string>
-			<string>3C44EABE-8D6F-4B1B-AB91-F419FAD1A0AD</string>
-		</array>
-		<key>items</key>
-		<array>
-			<string>637CEA2B-578C-429C-BB74-30E8D42BFA22</string>
-			<string>3F26240E-6E4A-11D9-B411-000D93589AF6</string>
-			<string>------------------------------------</string>
-			<string>AC5F664E-86BA-4D81-B6CE-1B12F69FA490</string>
-			<string>970EE6B4-A091-11D9-A5A2-000D93C8BE28</string>
-			<string>B8651C6E-A05E-11D9-86AC-000D93C8BE28</string>
-			<string>------------------------------------</string>
-			<string>F9C29821-4A19-4F5D-B9A2-F3C23360C044</string>
-			<string>4142979F-46F3-477A-B03B-43E92FE40D99</string>
-			<string>9B13543F-8356-443C-B6E7-D9259B604927</string>
-			<string>------------------------------------</string>
-			<string>CBD82CF3-74E9-4E7A-B3F6-9348754EB5AA</string>
-			<string>2ED44A32-C353-447F-BAE4-E3522DB6944D</string>
-			<string>0658019F-3635-462E-AAC2-74E4FE508A9B</string>
-			<string>284758F3-866D-4953-A0A0-11ED3B607F01</string>
-			<string>149FECAF-A325-4C2D-9B12-A9B131283945</string>
-			<string>------------------------------------</string>
-			<string>01F535FE-8F66-47A9-A6A2-93742869D7FC</string>
-			<string>13E2ED53-AF99-4D07-931B-1A4C889B66D4</string>
-			<string>3956D64B-0312-4C3E-863C-9A183052E26A</string>
-			<string>------------------------------------</string>
-			<string>BC8B8AE2-5F16-11D9-B9C3-000D93589AF6</string>
-			<string>991E7EBD-F3F5-469A-BA01-DC30E04AD472</string>
-			<string>912906A0-9A29-434B-AE98-E9DFDE6E48B4</string>
-			<string>------------------------------------</string>
-			<string>20D760B5-A127-11D9-A5A2-000D93C8BE28</string>
-			<string>45F92B81-6F0E-11D9-A1E4-000D9332809C</string>
-		</array>
-		<key>submenus</key>
-		<dict>
-			<key>01F535FE-8F66-47A9-A6A2-93742869D7FC</key>
-			<dict>
-				<key>items</key>
-				<array>
-					<string>0D814247-7A00-46EE-A2A4-45FBBF4B1181</string>
-					<string>4400BCE9-20E3-426E-B1D7-2C0BCA53BCF8</string>
-					<string>CA24BD98-E4B6-48F8-B15A-84CC533BE1BD</string>
-					<string>9AFDEB2C-D9F0-423E-8211-EBB089F51F0C</string>
-				</array>
-				<key>name</key>
-				<string>Includes</string>
-			</dict>
-			<key>13E2ED53-AF99-4D07-931B-1A4C889B66D4</key>
-			<dict>
-				<key>items</key>
-				<array>
-					<string>4117D930-B6FA-4022-97E7-ECCAF4E70F63</string>
-					<string>EBB98620-3292-4621-BA38-D8A9A65D9551</string>
-				</array>
-				<key>name</key>
-				<string>Format</string>
-			</dict>
-			<key>149FECAF-A325-4C2D-9B12-A9B131283945</key>
-			<dict>
-				<key>items</key>
-				<array>
-					<string>3463E85F-F500-49A0-8631-D78ED85F9D60</string>
-					<string>------------------------------------</string>
-					<string>4462A6B8-A08A-11D9-A5A2-000D93C8BE28</string>
-					<string>4905D47B-A08B-11D9-A5A2-000D93C8BE28</string>
-					<string>3E008E42-A5C9-11D9-9BCD-000D93C8BE28</string>
-					<string>576036C0-A60E-11D9-ABD6-000D93C8BE28</string>
-					<string>42F15753-9B6D-4DD8-984C-807B94363277</string>
-					<string>9BD2BE01-A854-4D55-B584-725D04C075C0</string>
-					<string>232C2E8B-A08E-11D9-A5A2-000D93C8BE28</string>
-					<string>9CF008C4-A086-11D9-A5A2-000D93C8BE28</string>
-					<string>65BA66DC-A07F-11D9-A5A2-000D93C8BE28</string>
-					<string>44180979-A08E-11D9-A5A2-000D93C8BE28</string>
-					<string>D8DCCC81-749A-4E2A-B4BC-D109D5799CAA</string>
-					<string>77BFD0C0-A08A-11D9-A5A2-000D93C8BE28</string>
-					<string>81DA4C74-A530-11D9-9BCD-000D93C8BE28</string>
-					<string>DA99AC44-A083-11D9-A5A2-000D93C8BE28</string>
-					<string>5820372E-A093-4F38-B25C-B0CCC50A0FC4</string>
-					<string>6592050A-A087-11D9-A5A2-000D93C8BE28</string>
-					<string>7D676C4C-A087-11D9-A5A2-000D93C8BE28</string>
-					<string>26023CFF-C73F-4EF5-9803-E4DBA2CBEADD</string>
-					<string>3C518074-A088-11D9-A5A2-000D93C8BE28</string>
-					<string>57176082-A12F-11D9-A5A2-000D93C8BE28</string>
-					<string>AAC9D7B8-A12C-11D9-A5A2-000D93C8BE28</string>
-					<string>B62ECABE-A086-11D9-A5A2-000D93C8BE28</string>
-				</array>
-				<key>name</key>
-				<string>Insert Tag</string>
-			</dict>
-			<key>284758F3-866D-4953-A0A0-11ED3B607F01</key>
-			<dict>
-				<key>items</key>
-				<array>
-					<string>08E4F47C-A570-4F9B-A6AE-DCAC0D2E2420</string>
-					<string>------------------------------------</string>
-					<string>944F1410-188C-4D70-8340-CECAA56FC7F2</string>
-					<string>B2AAEE56-42D8-42C3-8F67-865473F50E8D</string>
-					<string>------------------------------------</string>
-					<string>9ED6ABBE-A802-11D9-BFC8-000D93C8BE28</string>
-					<string>C8B83564-A802-11D9-BFC8-000D93C8BE28</string>
-					<string>7D8C2F74-A802-11D9-BFC8-000D93C8BE28</string>
-					<string>5CE8FC6E-A802-11D9-BFC8-000D93C8BE28</string>
-				</array>
-				<key>name</key>
-				<string>Insert DocType</string>
-			</dict>
-			<key>3956D64B-0312-4C3E-863C-9A183052E26A</key>
-			<dict>
-				<key>items</key>
-				<array>
-					<string>0ED6DA73-F38F-4A65-B18F-3379D2BA9387</string>
-					<string>3A517A94-001E-464D-8184-1FE56D0D0D70</string>
-					<string>E3F8984E-7269-4981-9D30-967AB56A6ACE</string>
-					<string>F3512848-7889-45DA-993B-0547976C8E6D</string>
-					<string>32BBB9AB-8732-4F91-A587-354941A27B69</string>
-					<string>48DF7485-52EA-49B3-88AF-3A41F933F325</string>
-					<string>CBC24AF4-88E0-498B-BE50-934B9CF29EC7</string>
-					<string>F00170EE-4A82-413F-A88B-85293E69A88B</string>
-				</array>
-				<key>name</key>
-				<string>Conditional Comments</string>
-			</dict>
-			<key>4142979F-46F3-477A-B03B-43E92FE40D99</key>
-			<dict>
-				<key>items</key>
-				<array>
-					<string>6B024865-6095-4CE3-8EDD-DC6F2230C2FF</string>
-					<string>2C4C9673-B166-432A-8938-75A5CA622481</string>
-				</array>
-				<key>name</key>
-				<string>URL Escapes</string>
-			</dict>
-			<key>F9C29821-4A19-4F5D-B9A2-F3C23360C044</key>
-			<dict>
-				<key>items</key>
-				<array>
-					<string>3DD8406C-A116-11D9-A5A2-000D93C8BE28</string>
-					<string>43C9E8AE-3E53-4B82-A1AF-56697BB3EF09</string>
-					<string>C183920D-A126-11D9-A5A2-000D93C8BE28</string>
-					<string>------------------------------------</string>
-					<string>73B40BAE-A295-11D9-87F7-000D93C8BE28</string>
-					<string>C70BB693-0954-4440-AEB4-F2ADD6D923F0</string>
-					<string>C0418A4A-7E42-4D49-8F86-6E339296CB84</string>
-					<string>7F102705-27D8-4029-BF61-2F042FB61E06</string>
-					<string>7062316B-4236-4793-AD35-05E4A6577393</string>
-					<string>B4987DA5-9C2F-4D2D-AC14-678115079205</string>
-					<string>44E448B6-37CE-4BFE-8611-C5113593B74B</string>
-					<string>9B216475-D73D-4518-851F-CACD0066A909</string>
-					<string>ADC78A82-40C2-4AAC-8968-93AF0ED98DF0</string>
-					<string>38E50882-27AF-4246-A039-355C3E1A699E</string>
-					<string>7214ACD1-93D9-4D3F-A428-8A7302E0A35E</string>
-					<string>35654B4E-2D76-4CD3-8FBB-2DA1F314BA19</string>
-					<string>AC15621A-8A16-40DD-A671-EA4C37637215</string>
-					<string>0E2F4A47-EADE-4A05-931E-FC874FA28FC3</string>
-					<string>1B8D58B9-D9DB-484C-AACD-5D5DF5385308</string>
-					<string>D7CC7C7C-CD01-4357-AF91-AEFFD914DF98</string>
-					<string>980A8D39-CA8B-4EC2-9739-DC36A262F28E</string>
-					<string>------------------------------------</string>
-					<string>89E5CC0A-3EFF-4DEF-A299-2E9651DE6529</string>
-				</array>
-				<key>name</key>
-				<string>Entities</string>
-			</dict>
-		</dict>
-	</dict>
-	<key>name</key>
-	<string>HTML</string>
-	<key>ordering</key>
-	<array>
-		<string>3DD8406C-A116-11D9-A5A2-000D93C8BE28</string>
-		<string>43C9E8AE-3E53-4B82-A1AF-56697BB3EF09</string>
-		<string>6B024865-6095-4CE3-8EDD-DC6F2230C2FF</string>
-		<string>C183920D-A126-11D9-A5A2-000D93C8BE28</string>
-		<string>2C4C9673-B166-432A-8938-75A5CA622481</string>
-		<string>637CEA2B-578C-429C-BB74-30E8D42BFA22</string>
-		<string>9B13543F-8356-443C-B6E7-D9259B604927</string>
-		<string>89E5CC0A-3EFF-4DEF-A299-2E9651DE6529</string>
-		<string>2ED44A32-C353-447F-BAE4-E3522DB6944D</string>
-		<string>0658019F-3635-462E-AAC2-74E4FE508A9B</string>
-		<string>970EE6B4-A091-11D9-A5A2-000D93C8BE28</string>
-		<string>3F26240E-6E4A-11D9-B411-000D93589AF6</string>
-		<string>B8651C6E-A05E-11D9-86AC-000D93C8BE28</string>
-		<string>20D760B5-A127-11D9-A5A2-000D93C8BE28</string>
-		<string>991E7EBD-F3F5-469A-BA01-DC30E04AD472</string>
-		<string>0D814247-7A00-46EE-A2A4-45FBBF4B1181</string>
-		<string>4400BCE9-20E3-426E-B1D7-2C0BCA53BCF8</string>
-		<string>CA24BD98-E4B6-48F8-B15A-84CC533BE1BD</string>
-		<string>9AFDEB2C-D9F0-423E-8211-EBB089F51F0C</string>
-		<string>B23D6E15-6B33-11D9-86C1-000D93589AF6</string>
-		<string>BD4AEF38-638B-4C47-A762-4A0A6190F9C7</string>
-		<string>6F71B1E5-81D0-4D94-A2C5-7688A3D3EDB3</string>
-		<string>30130739-4E58-4720-9B27-88C7EE168D83</string>
-		<string>C8B717C2-6B33-11D9-BB47-000D93589AF6</string>
-		<string>92F77050-74F9-4DF7-9A6E-2B42641849F7</string>
-		<string>CD6D2CC6-6B33-11D9-BDFD-000D93589AF6</string>
-		<string>52124611-B363-40AD-B9F0-0A811941CD20</string>
-		<string>EBE53CE6-AEBB-4318-AE98-D07F3755E3F9</string>
-		<string>7B7E945E-A112-11D9-A5A2-000D93C8BE28</string>
-		<string>4462A6B8-A08A-11D9-A5A2-000D93C8BE28</string>
-		<string>4905D47B-A08B-11D9-A5A2-000D93C8BE28</string>
-		<string>3E008E42-A5C9-11D9-9BCD-000D93C8BE28</string>
-		<string>576036C0-A60E-11D9-ABD6-000D93C8BE28</string>
-		<string>42F15753-9B6D-4DD8-984C-807B94363277</string>
-		<string>9BD2BE01-A854-4D55-B584-725D04C075C0</string>
-		<string>232C2E8B-A08E-11D9-A5A2-000D93C8BE28</string>
-		<string>9CF008C4-A086-11D9-A5A2-000D93C8BE28</string>
-		<string>65BA66DC-A07F-11D9-A5A2-000D93C8BE28</string>
-		<string>44180979-A08E-11D9-A5A2-000D93C8BE28</string>
-		<string>D8DCCC81-749A-4E2A-B4BC-D109D5799CAA</string>
-		<string>77BFD0C0-A08A-11D9-A5A2-000D93C8BE28</string>
-		<string>81DA4C74-A530-11D9-9BCD-000D93C8BE28</string>
-		<string>DA99AC44-A083-11D9-A5A2-000D93C8BE28</string>
-		<string>73B40BAE-A295-11D9-87F7-000D93C8BE28</string>
-		<string>5820372E-A093-4F38-B25C-B0CCC50A0FC4</string>
-		<string>6592050A-A087-11D9-A5A2-000D93C8BE28</string>
-		<string>7D676C4C-A087-11D9-A5A2-000D93C8BE28</string>
-		<string>26023CFF-C73F-4EF5-9803-E4DBA2CBEADD</string>
-		<string>3C518074-A088-11D9-A5A2-000D93C8BE28</string>
-		<string>57176082-A12F-11D9-A5A2-000D93C8BE28</string>
-		<string>AAC9D7B8-A12C-11D9-A5A2-000D93C8BE28</string>
-		<string>B62ECABE-A086-11D9-A5A2-000D93C8BE28</string>
-		<string>BC8B8AE2-5F16-11D9-B9C3-000D93589AF6</string>
-		<string>944F1410-188C-4D70-8340-CECAA56FC7F2</string>
-		<string>B2AAEE56-42D8-42C3-8F67-865473F50E8D</string>
-		<string>08E4F47C-A570-4F9B-A6AE-DCAC0D2E2420</string>
-		<string>9ED6ABBE-A802-11D9-BFC8-000D93C8BE28</string>
-		<string>C8B83564-A802-11D9-BFC8-000D93C8BE28</string>
-		<string>7D8C2F74-A802-11D9-BFC8-000D93C8BE28</string>
-		<string>5CE8FC6E-A802-11D9-BFC8-000D93C8BE28</string>
-		<string>3C44EABE-8D6F-4B1B-AB91-F419FAD1A0AD</string>
-		<string>912906A0-9A29-434B-AE98-E9DFDE6E48B4</string>
-		<string>EBB98620-3292-4621-BA38-D8A9A65D9551</string>
-		<string>4117D930-B6FA-4022-97E7-ECCAF4E70F63</string>
-		<string>17994EC8-6B1D-11D9-AC3A-000D93589AF6</string>
-		<string>B79BDBCF-D0C9-468E-BE62-744074D7825F</string>
-		<string>FC34BE82-69DC-47B0-997A-37A8763D4E69</string>
-		<string>E7C5859E-122D-4382-84BE-5AB584DC2409</string>
-		<string>73251DBE-EBD2-470F-8148-E6F2EC1A9641</string>
-		<string>6D6B631D-0D6C-413C-B4FA-1D535CBCE890</string>
-		<string>3463E85F-F500-49A0-8631-D78ED85F9D60</string>
-		<string>CBD82CF3-74E9-4E7A-B3F6-9348754EB5AA</string>
-		<string>4720ADB8-DD17-4F97-A715-AFD72E22CE45</string>
-		<string>69BD9C8F-15C0-4F67-8B7E-64E48B5E9E71</string>
-		<string>04332FA8-8157-46C4-9854-8C190FFD96C6</string>
-		<string>E6F19171-F664-4B4F-92DA-3E15E6CAD35C</string>
-		<string>26068A55-4C84-409D-BA00-162B55AF6961</string>
-		<string>EBEE6B51-29C7-4362-818F-A190CACD5296</string>
-		<string>65D38039-6B0A-48E9-9E49-43832ECC4107</string>
-		<string>CDE8EFD6-9DE2-4E8C-BB6A-52E8CCD2E977</string>
-		<string>C0418A4A-7E42-4D49-8F86-6E339296CB84</string>
-		<string>0E2F4A47-EADE-4A05-931E-FC874FA28FC3</string>
-		<string>C70BB693-0954-4440-AEB4-F2ADD6D923F0</string>
-		<string>AC15621A-8A16-40DD-A671-EA4C37637215</string>
-		<string>35654B4E-2D76-4CD3-8FBB-2DA1F314BA19</string>
-		<string>9B216475-D73D-4518-851F-CACD0066A909</string>
-		<string>7F102705-27D8-4029-BF61-2F042FB61E06</string>
-		<string>ADC78A82-40C2-4AAC-8968-93AF0ED98DF0</string>
-		<string>1B8D58B9-D9DB-484C-AACD-5D5DF5385308</string>
-		<string>B4987DA5-9C2F-4D2D-AC14-678115079205</string>
-		<string>7062316B-4236-4793-AD35-05E4A6577393</string>
-		<string>7214ACD1-93D9-4D3F-A428-8A7302E0A35E</string>
-		<string>980A8D39-CA8B-4EC2-9739-DC36A262F28E</string>
-		<string>44E448B6-37CE-4BFE-8611-C5113593B74B</string>
-		<string>38E50882-27AF-4246-A039-355C3E1A699E</string>
-		<string>D7CC7C7C-CD01-4357-AF91-AEFFD914DF98</string>
-		<string>0ED6DA73-F38F-4A65-B18F-3379D2BA9387</string>
-		<string>3A517A94-001E-464D-8184-1FE56D0D0D70</string>
-		<string>E3F8984E-7269-4981-9D30-967AB56A6ACE</string>
-		<string>F3512848-7889-45DA-993B-0547976C8E6D</string>
-		<string>32BBB9AB-8732-4F91-A587-354941A27B69</string>
-		<string>48DF7485-52EA-49B3-88AF-3A41F933F325</string>
-		<string>CBC24AF4-88E0-498B-BE50-934B9CF29EC7</string>
-		<string>F00170EE-4A82-413F-A88B-85293E69A88B</string>
-		<string>45F92B81-6F0E-11D9-A1E4-000D9332809C</string>
-	</array>
-	<key>uuid</key>
-	<string>4676FC6D-6227-11D9-BFB1-000D93589AF6</string>
-</dict>
-</plist>
diff --git a/bundles/javascript.tmbundle/Commands/Copy as Bookmarklet to Clipboard.tmCommand b/bundles/javascript.tmbundle/Commands/Copy as Bookmarklet to Clipboard.tmCommand
deleted file mode 100644
index 7410fbf51..000000000
--- a/bundles/javascript.tmbundle/Commands/Copy as Bookmarklet to Clipboard.tmCommand	
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>command</key>
-	<string>#!/usr/bin/env perl
-#
-# Written by John Gruber, taken with permission from:
-# http://daringfireball.net/2007/03/javascript_bookmarklet_builder
-
-use strict;
-use warnings;
-use URI::Escape qw(uri_escape_utf8);
-use open  IO  =&gt; ":utf8",       # UTF8 by default
-          ":std";               # Apply to STDIN/STDOUT/STDERR
-
-my $src = do { local $/; &lt;&gt; };
-
-# Zap the first line if there's already a bookmarklet comment:
-$src =~ s{^// ?javascript:.+\n}{};
-my $bookmarklet = $src;
-
-$bookmarklet =~ s{^\s*//.+\n}{}gm;  # Kill comments.
-$bookmarklet =~ s{\t}{ }gm;         # Tabs to spaces
-$bookmarklet =~ s{ +}{ }gm;         # Space runs to one space
-$bookmarklet =~ s{^\s+}{}gm;        # Kill line-leading whitespace
-$bookmarklet =~ s{\s+$}{}gm;        # Kill line-ending whitespace
-$bookmarklet =~ s{\n}{}gm;          # Kill newlines
-
-# Escape single- and double-quotes, spaces, control chars, unicode:
-$bookmarklet = "javascript:" .
-    uri_escape_utf8($bookmarklet, qq('" \x00-\x1f\x7f-\xff));
-
-print "// $bookmarklet\n" . $src;
-
-# Put bookmarklet on clipboard:
-`/bin/echo -n '$bookmarklet' | /usr/bin/pbcopy`;
-</string>
-	<key>input</key>
-	<string>selection</string>
-	<key>keyEquivalent</key>
-	<string>^H</string>
-	<key>name</key>
-	<string>Copy as Bookmarklet to Clipboard</string>
-	<key>output</key>
-	<string>replaceSelectedText</string>
-	<key>scope</key>
-	<string>source.js</string>
-	<key>uuid</key>
-	<string>20E61C43-B81F-4FB9-9362-BFFE668EB9C9</string>
-</dict>
-</plist>
diff --git a/bundles/javascript.tmbundle/Commands/Documentation for Word.plist b/bundles/javascript.tmbundle/Commands/Documentation for Word.plist
deleted file mode 100644
index d9d98f993..000000000
--- a/bundles/javascript.tmbundle/Commands/Documentation for Word.plist	
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>command</key>
-	<string># index created using: curl -s 'http://devguru.com/technologies/javascript/index.asp'|grep -o '&lt;a href="[0-9]*.asp"&gt;[a-z][a-zA-Z]*&lt;/a&gt;'|perl -pe 's/&lt;a href="([^"]*)"&gt;([^&lt;]*)&lt;\/a&gt;/$2\t$1/'|sort|uniq|gzip &gt;dev_guru_index.gz
-
-ref=$(zgrep -w "^${TM_SELECTED_TEXT:-$TM_CURRENT_WORD}" "$TM_BUNDLE_SUPPORT/dev_guru_index.gz"|cut -f2)
-
-[[ -n "$ref" ]] &amp;&amp; exit_show_html "&lt;meta http-equiv='Refresh' content='0;URL=http://devguru.com/technologies/javascript/$ref'&gt;"
-
-echo "No documentation found."</string>
-	<key>fallbackInput</key>
-	<string>word</string>
-	<key>input</key>
-	<string>selection</string>
-	<key>keyEquivalent</key>
-	<string>^h</string>
-	<key>name</key>
-	<string>Documentation for Word / Selection</string>
-	<key>output</key>
-	<string>showAsTooltip</string>
-	<key>scope</key>
-	<string>source.js</string>
-	<key>uuid</key>
-	<string>B4874A14-2491-465A-A349-61E4EBCF4700</string>
-</dict>
-</plist>
diff --git a/bundles/javascript.tmbundle/Commands/New Function.tmCommand b/bundles/javascript.tmbundle/Commands/New Function.tmCommand
deleted file mode 100644
index 064d36410..000000000
--- a/bundles/javascript.tmbundle/Commands/New Function.tmCommand	
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>command</key>
-	<string>cat &lt;&lt;SNIPPET
-function ${TM_SELECTED_TEXT:-$TM_CURRENT_WORD}(\${1:args}) {
-	\$0
-}
-SNIPPET</string>
-	<key>fallbackInput</key>
-	<string>word</string>
-	<key>input</key>
-	<string>selection</string>
-	<key>keyEquivalent</key>
-	<string>$
</string>
-	<key>name</key>
-	<string>New Function</string>
-	<key>output</key>
-	<string>insertAsSnippet</string>
-	<key>scope</key>
-	<string>source.js</string>
-	<key>uuid</key>
-	<string>73951799-AC15-40A6-81DB-EC051AB4A033</string>
-</dict>
-</plist>
diff --git a/bundles/javascript.tmbundle/Commands/New Method.tmCommand b/bundles/javascript.tmbundle/Commands/New Method.tmCommand
deleted file mode 100644
index 2e02018ee..000000000
--- a/bundles/javascript.tmbundle/Commands/New Method.tmCommand	
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>command</key>
-	<string>cat &lt;&lt;SNIPPET
-${TM_SELECTED_TEXT:-$TM_CURRENT_WORD}: function(\${1:args}) {
-	\$0
-}\${2:,}
-SNIPPET</string>
-	<key>fallbackInput</key>
-	<string>word</string>
-	<key>input</key>
-	<string>selection</string>
-	<key>keyEquivalent</key>
-	<string>~$
</string>
-	<key>name</key>
-	<string>New Method</string>
-	<key>output</key>
-	<string>insertAsSnippet</string>
-	<key>scope</key>
-	<string>source.js</string>
-	<key>uuid</key>
-	<string>1717B5AE-209B-4548-9155-9E88A7230C1C</string>
-</dict>
-</plist>
diff --git a/bundles/javascript.tmbundle/Commands/Reformat Document : Selection.tmCommand b/bundles/javascript.tmbundle/Commands/Reformat Document : Selection.tmCommand
deleted file mode 100644
index 644f3ba63..000000000
--- a/bundles/javascript.tmbundle/Commands/Reformat Document : Selection.tmCommand	
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>command</key>
-	<string>#!/usr/bin/env python
-
-import os
-import sys
-
-sys.path.append(os.path.join(os.environ["TM_BUNDLE_SUPPORT"], "lib"))
-
-import jsbeautifier
-
-opts = jsbeautifier.default_options()
-
-if os.environ["TM_SOFT_TABS"] == 'NO':
-    opts.indent_size = 1
-    opts.indent_char = '\t'
-else:
-    opts.indent_size = int(os.environ["TM_TAB_SIZE"])
-
-print jsbeautifier.beautify_file('-', opts)
-</string>
-	<key>input</key>
-	<string>selection</string>
-	<key>keyEquivalent</key>
-	<string>^H</string>
-	<key>name</key>
-	<string>Reformat Document / Selection</string>
-	<key>output</key>
-	<string>replaceSelectedText</string>
-	<key>scope</key>
-	<string>source.js</string>
-	<key>uuid</key>
-	<string>36EC03E9-EFF4-479A-AB90-8DFA16800642</string>
-</dict>
-</plist>
diff --git a/bundles/javascript.tmbundle/Preferences/Comments.tmPreferences b/bundles/javascript.tmbundle/Preferences/Comments.tmPreferences
deleted file mode 100644
index 2b7a18388..000000000
--- a/bundles/javascript.tmbundle/Preferences/Comments.tmPreferences
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>name</key>
-	<string>Comments</string>
-	<key>scope</key>
-	<string>source.js</string>
-	<key>settings</key>
-	<dict>
-		<key>shellVariables</key>
-		<array>
-			<dict>
-				<key>name</key>
-				<string>TM_COMMENT_START</string>
-				<key>value</key>
-				<string>// </string>
-			</dict>
-			<dict>
-				<key>name</key>
-				<string>TM_COMMENT_START_2</string>
-				<key>value</key>
-				<string>/*</string>
-			</dict>
-			<dict>
-				<key>name</key>
-				<string>TM_COMMENT_END_2</string>
-				<key>value</key>
-				<string>*/</string>
-			</dict>
-		</array>
-	</dict>
-	<key>uuid</key>
-	<string>A67A8BD9-A951-406F-9175-018DD4B52FD1</string>
-</dict>
-</plist>
diff --git a/bundles/javascript.tmbundle/Preferences/JavaScript Indent.tmPreferences b/bundles/javascript.tmbundle/Preferences/JavaScript Indent.tmPreferences
deleted file mode 100644
index b6b6ffc54..000000000
--- a/bundles/javascript.tmbundle/Preferences/JavaScript Indent.tmPreferences	
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>name</key>
-	<string>JavaScript Indent</string>
-	<key>scope</key>
-	<string>source.js</string>
-	<key>settings</key>
-	<dict>
-		<key>decreaseIndentPattern</key>
-		<string>^(.*\*/)?\s*(\}|\))([^{]*\{)?([;,]?\s*|\.[^{]*|\s*\)[;\s]*)$</string>
-		<key>increaseIndentPattern</key>
-		<string>^.*(\{[^}"']*|\([^)"']*)$</string>
-	</dict>
-	<key>uuid</key>
-	<string>BC062860-3346-4D3B-8421-C5543F83D11F</string>
-</dict>
-</plist>
diff --git a/bundles/javascript.tmbundle/Preferences/Symbol List Banned.tmPreferences b/bundles/javascript.tmbundle/Preferences/Symbol List Banned.tmPreferences
deleted file mode 100644
index c51de2a03..000000000
--- a/bundles/javascript.tmbundle/Preferences/Symbol List Banned.tmPreferences	
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>name</key>
-	<string>Symbol List Banned</string>
-	<key>scope</key>
-	<string>source.js meta.property.function entity.name.function</string>
-	<key>settings</key>
-	<dict>
-		<key>showInSymbolList</key>
-		<string>0</string>
-	</dict>
-	<key>uuid</key>
-	<string>834BC727-6B31-4073-A161-4823227219EF</string>
-</dict>
-</plist>
diff --git a/bundles/javascript.tmbundle/Preferences/Symbol List Class.tmPreferences b/bundles/javascript.tmbundle/Preferences/Symbol List Class.tmPreferences
deleted file mode 100644
index 50d8a7fcf..000000000
--- a/bundles/javascript.tmbundle/Preferences/Symbol List Class.tmPreferences	
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>name</key>
-	<string>Symbol List Class</string>
-	<key>scope</key>
-	<string>source.js entity.name.type.class</string>
-	<key>settings</key>
-	<dict>
-		<key>showInSymbolList</key>
-		<string>1</string>
-		<key>symbolTransformation</key>
-		<string>
-      s/^/• /g;
-   </string>
-	</dict>
-	<key>uuid</key>
-	<string>3CEA49B2-A5C5-405C-82E2-B8B668877C37</string>
-</dict>
-</plist>
diff --git a/bundles/javascript.tmbundle/Preferences/Symbol List Instance.tmPreferences b/bundles/javascript.tmbundle/Preferences/Symbol List Instance.tmPreferences
deleted file mode 100644
index 55ebd5fa9..000000000
--- a/bundles/javascript.tmbundle/Preferences/Symbol List Instance.tmPreferences	
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>name</key>
-	<string>Symbol List Instance</string>
-	<key>scope</key>
-	<string>source.js entity.name.instance</string>
-	<key>settings</key>
-	<dict>
-		<key>showInSymbolList</key>
-		<string>1</string>
-		<key>symbolTransformation</key>
-		<string>
-      s/^/\t/g;
-   </string>
-	</dict>
-	<key>uuid</key>
-	<string>E6EB7CC8-04E8-43A9-93B2-BC9EF5BA862B</string>
-</dict>
-</plist>
diff --git a/bundles/javascript.tmbundle/Preferences/Symbol List Sub 1.tmPreferences b/bundles/javascript.tmbundle/Preferences/Symbol List Sub 1.tmPreferences
deleted file mode 100644
index 28acc1392..000000000
--- a/bundles/javascript.tmbundle/Preferences/Symbol List Sub 1.tmPreferences	
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>name</key>
-	<string>Symbol List Sub 1</string>
-	<key>scope</key>
-	<string>source.js object.property.function -(meta.group meta.group)</string>
-	<key>settings</key>
-	<dict>
-		<key>showInSymbolList</key>
-		<string>1</string>
-		<key>symbolTransformation</key>
-		<string>
-      s/^/ :/g;
-   </string>
-	</dict>
-	<key>uuid</key>
-	<string>73557394-4F0F-4DD3-8029-EEE8201AC7F5</string>
-</dict>
-</plist>
diff --git a/bundles/javascript.tmbundle/Preferences/Symbol List Sub 2.tmPreferences b/bundles/javascript.tmbundle/Preferences/Symbol List Sub 2.tmPreferences
deleted file mode 100644
index be4beb83f..000000000
--- a/bundles/javascript.tmbundle/Preferences/Symbol List Sub 2.tmPreferences	
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>name</key>
-	<string>Symbol List Sub 2</string>
-	<key>scope</key>
-	<string>source.js meta.group meta.group object.property.function</string>
-	<key>settings</key>
-	<dict>
-		<key>showInSymbolList</key>
-		<string>1</string>
-		<key>symbolTransformation</key>
-		<string>
-      s/^/  :/g;
-   </string>
-	</dict>
-	<key>uuid</key>
-	<string>51841DDB-C2A4-461C-A8AB-6C124AD50EAE</string>
-</dict>
-</plist>
diff --git a/bundles/javascript.tmbundle/Snippets/Get Elements.tmSnippet b/bundles/javascript.tmbundle/Snippets/Get Elements.tmSnippet
deleted file mode 100644
index 3031d9f12..000000000
--- a/bundles/javascript.tmbundle/Snippets/Get Elements.tmSnippet	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>getElement${1/(T)|.*/(?1:s)/}By${1:T}${1/(T)|(I)|.*/(?1:agName)(?2:d)/}('$2')</string>
-	<key>name</key>
-	<string>Get Elements</string>
-	<key>scope</key>
-	<string>source.js</string>
-	<key>tabTrigger</key>
-	<string>get</string>
-	<key>uuid</key>
-	<string>9E0E3BCC-7F20-4D6B-891D-A44D6EC56E31</string>
-</dict>
-</plist>
diff --git a/bundles/javascript.tmbundle/Snippets/Object Method String.tmSnippet b/bundles/javascript.tmbundle/Snippets/Object Method String.tmSnippet
deleted file mode 100644
index 8b7ec64cd..000000000
--- a/bundles/javascript.tmbundle/Snippets/Object Method String.tmSnippet	
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>'${1:${2:#thing}:${3:click}}': function(element){
-	$0
-}${10:,}</string>
-	<key>name</key>
-	<string>Object Method String</string>
-	<key>scope</key>
-	<string>source.js</string>
-	<key>tabTrigger</key>
-	<string>'':f</string>
-	<key>uuid</key>
-	<string>7B9AEFCC-B450-416D-8527-430FE2A08568</string>
-</dict>
-</plist>
diff --git a/bundles/javascript.tmbundle/Snippets/Object Method.tmSnippet b/bundles/javascript.tmbundle/Snippets/Object Method.tmSnippet
deleted file mode 100644
index 5ee0d08f3..000000000
--- a/bundles/javascript.tmbundle/Snippets/Object Method.tmSnippet	
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>${1:method_name}: function(${3:attribute}){
-	$0
-}${10:,}</string>
-	<key>name</key>
-	<string>Object Method</string>
-	<key>scope</key>
-	<string>source.js</string>
-	<key>tabTrigger</key>
-	<string>:f</string>
-	<key>uuid</key>
-	<string>77065D69-742A-4FF0-9A41-AD211DFBE72F</string>
-</dict>
-</plist>
diff --git a/bundles/javascript.tmbundle/Snippets/Object Value JS.tmSnippet b/bundles/javascript.tmbundle/Snippets/Object Value JS.tmSnippet
deleted file mode 100644
index b74121730..000000000
--- a/bundles/javascript.tmbundle/Snippets/Object Value JS.tmSnippet	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>${1:value_name}:${0:value},</string>
-	<key>name</key>
-	<string>Object Value JS</string>
-	<key>scope</key>
-	<string>source.js</string>
-	<key>tabTrigger</key>
-	<string>:,</string>
-	<key>uuid</key>
-	<string>AD506BEC-B33C-4168-A900-0A4D386A4B05</string>
-</dict>
-</plist>
diff --git "a/bundles/javascript.tmbundle/Snippets/Object key — key: \"value\".tmSnippet" "b/bundles/javascript.tmbundle/Snippets/Object key — key: \"value\".tmSnippet"
deleted file mode 100644
index 12bc4e1da..000000000
--- "a/bundles/javascript.tmbundle/Snippets/Object key — key: \"value\".tmSnippet"	
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>${1:key}: ${2:"${3:value}"}${4:, }</string>
-	<key>keyEquivalent</key>
-	<string>~:</string>
-	<key>name</key>
-	<string>Object key — key: "value"</string>
-	<key>scope</key>
-	<string>source.js</string>
-	<key>tabTrigger</key>
-	<string>:</string>
-	<key>uuid</key>
-	<string>DC8B46FB-8ADA-45EA-8F36-94C807A0D302</string>
-</dict>
-</plist>
diff --git a/bundles/javascript.tmbundle/Snippets/Prototype (proto).plist b/bundles/javascript.tmbundle/Snippets/Prototype (proto).plist
deleted file mode 100644
index 252c27906..000000000
--- a/bundles/javascript.tmbundle/Snippets/Prototype (proto).plist	
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>${1:class_name}.prototype.${2:method_name} = function(${3:first_argument}) {
-	${0:// body...}
-};
-</string>
-	<key>name</key>
-	<string>Prototype</string>
-	<key>scope</key>
-	<string>source.js</string>
-	<key>tabTrigger</key>
-	<string>proto</string>
-	<key>uuid</key>
-	<string>2F96136B-0193-42F5-90FC-B6F456A3AD77</string>
-</dict>
-</plist>
diff --git a/bundles/javascript.tmbundle/Snippets/for (…) {…} (faster).tmSnippet b/bundles/javascript.tmbundle/Snippets/for (…) {…} (faster).tmSnippet
deleted file mode 100644
index 34e6b712e..000000000
--- a/bundles/javascript.tmbundle/Snippets/for (…) {…} (faster).tmSnippet	
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>for (var ${20:i} = ${1:Things}.length - 1; ${20:i} &gt;= 0; ${20:i}--){
-	${100:${1:Things}[${20:i}]}$0
-};</string>
-	<key>name</key>
-	<string>for (…) {…} (Improved Native For-Loop)</string>
-	<key>scope</key>
-	<string>source.js</string>
-	<key>tabTrigger</key>
-	<string>for</string>
-	<key>uuid</key>
-	<string>C207B7C3-5597-4873-8AAD-C46FB8842AF2</string>
-</dict>
-</plist>
diff --git a/bundles/javascript.tmbundle/Snippets/for (…) {…}.tmSnippet b/bundles/javascript.tmbundle/Snippets/for (…) {…}.tmSnippet
deleted file mode 100644
index d41b04768..000000000
--- a/bundles/javascript.tmbundle/Snippets/for (…) {…}.tmSnippet	
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>for (var ${20:i}=0; ${20:i} &lt; ${1:Things}.length; ${20:i}++) {
-	${100:${1:Things}[${20:i}]}$0
-};</string>
-	<key>name</key>
-	<string>for (…) {…}</string>
-	<key>scope</key>
-	<string>source.js</string>
-	<key>tabTrigger</key>
-	<string>for</string>
-	<key>uuid</key>
-	<string>011C4681-FBEC-4891-9326-3DECFCDED6D6</string>
-</dict>
-</plist>
diff --git a/bundles/javascript.tmbundle/Snippets/function (fun).plist b/bundles/javascript.tmbundle/Snippets/function (fun).plist
deleted file mode 100644
index 0ca6d4eb8..000000000
--- a/bundles/javascript.tmbundle/Snippets/function (fun).plist	
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>function ${1:function_name} (${2:argument}) {
-	${0:// body...}
-}</string>
-	<key>name</key>
-	<string>Function</string>
-	<key>scope</key>
-	<string>source.js</string>
-	<key>tabTrigger</key>
-	<string>fun</string>
-	<key>uuid</key>
-	<string>F0E4FB6A-4878-48C6-A777-62438DF1E14F</string>
-</dict>
-</plist>
diff --git a/bundles/javascript.tmbundle/Snippets/function.tmSnippet b/bundles/javascript.tmbundle/Snippets/function.tmSnippet
deleted file mode 100644
index 8a3cf1e4e..000000000
--- a/bundles/javascript.tmbundle/Snippets/function.tmSnippet
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>function($1) {${0:$TM_SELECTED_TEXT}};</string>
-	<key>name</key>
-	<string>Anonymous Function</string>
-	<key>scope</key>
-	<string>source.js</string>
-	<key>tabTrigger</key>
-	<string>f</string>
-	<key>uuid</key>
-	<string>4C6EDB43-3E2E-411B-A016-13C135C59833</string>
-</dict>
-</plist>
diff --git a/bundles/javascript.tmbundle/Snippets/if ___ else.tmSnippet b/bundles/javascript.tmbundle/Snippets/if ___ else.tmSnippet
deleted file mode 100644
index 421f45e41..000000000
--- a/bundles/javascript.tmbundle/Snippets/if ___ else.tmSnippet	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>if (${1:true}) {${0:$TM_SELECTED_TEXT}} else{};</string>
-	<key>name</key>
-	<string>if … else</string>
-	<key>scope</key>
-	<string>source.js</string>
-	<key>tabTrigger</key>
-	<string>ife</string>
-	<key>uuid</key>
-	<string>31964029-9D71-4ADC-8213-DFE5C4E222B3</string>
-</dict>
-</plist>
diff --git a/bundles/javascript.tmbundle/Snippets/if.tmSnippet b/bundles/javascript.tmbundle/Snippets/if.tmSnippet
deleted file mode 100644
index dbfb7e73f..000000000
--- a/bundles/javascript.tmbundle/Snippets/if.tmSnippet
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>if (${1:true}) {${0:$TM_SELECTED_TEXT}};</string>
-	<key>name</key>
-	<string>if</string>
-	<key>scope</key>
-	<string>source.js</string>
-	<key>tabTrigger</key>
-	<string>if</string>
-	<key>uuid</key>
-	<string>F19F3732-39A7-48EC-A72B-A8F477A01795</string>
-</dict>
-</plist>
diff --git a/bundles/javascript.tmbundle/Snippets/setTimeout function.tmSnippet b/bundles/javascript.tmbundle/Snippets/setTimeout function.tmSnippet
deleted file mode 100644
index 5d9894e38..000000000
--- a/bundles/javascript.tmbundle/Snippets/setTimeout function.tmSnippet	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>setTimeout(function() {$0}${2:}, ${1:10});</string>
-	<key>name</key>
-	<string>setTimeout function</string>
-	<key>scope</key>
-	<string>source.js</string>
-	<key>tabTrigger</key>
-	<string>timeout</string>
-	<key>uuid</key>
-	<string>009A3E6C-FE3F-4A18-8759-2DC31F17BBE2</string>
-</dict>
-</plist>
diff --git a/bundles/javascript.tmbundle/Support/dev_guru_index.gz b/bundles/javascript.tmbundle/Support/dev_guru_index.gz
deleted file mode 100644
index b657fbc5e6f3c00e0a58727ccbf2308915e9ebe9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1987
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
V;rPax8tfs}{{eh_3F)O20084W^o0Nb

diff --git a/bundles/javascript.tmbundle/Support/lib/jsbeautifier-license.txt b/bundles/javascript.tmbundle/Support/lib/jsbeautifier-license.txt
deleted file mode 100755
index 1857514a6..000000000
--- a/bundles/javascript.tmbundle/Support/lib/jsbeautifier-license.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-Copyright (c) 2009 - 2011, Einar Lielmanis
-
-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 --git a/bundles/javascript.tmbundle/Support/lib/jsbeautifier.py b/bundles/javascript.tmbundle/Support/lib/jsbeautifier.py
deleted file mode 100755
index 492658f84..000000000
--- a/bundles/javascript.tmbundle/Support/lib/jsbeautifier.py
+++ /dev/null
@@ -1,1080 +0,0 @@
-#!/usr/bin/env python
-
-import sys
-import getopt
-import re
-
-#
-# Originally written by Einar Lielmanis et al.,
-# Conversion to python by Einar Lielmanis, einar@jsbeautifier.org,
-# MIT licence, enjoy.
-#
-# Python is not my native language, feel free to push things around.
-#
-# Use either from command line (script displays its usage when run
-# without any parameters),
-#
-#
-# or, alternatively, use it as a module:
-#
-#   import jsbeautifier
-#   res = jsbeautifier.beautify('your javascript string')
-#   res = jsbeautifier.beautify_file('some_file.js')
-#
-#  you may specify some options:
-#
-#   opts = jsbeautifier.default_options()
-#   opts.indent_size = 2
-#   res = jsbeautifier.beautify('some javascript', opts)
-#
-#
-# Here are the available options: (read source)
-
-
-class BeautifierOptions:
-    def __init__(self):
-        self.indent_size = 4
-        self.indent_char = ' '
-        self.preserve_newlines = True
-        self.max_preserve_newlines = 10.
-        self.jslint_happy = False
-        self.brace_style = 'collapse'
-        self.keep_array_indentation = False
-        self.indent_level = 0
-
-
-
-    def __repr__(self):
-        return \
-"""indent_size = %d
-indent_char = [%s]
-preserve_newlines = %s
-max_preserve_newlines = %d
-jslint_happy = %s
-brace_style = %s
-keep_array_indentation = %s
-indent_level = %d
-""" % ( self.indent_size,
-        self.indent_char,
-        self.preserve_newlines,
-        self.max_preserve_newlines,
-        self.jslint_happy,
-        self.brace_style,
-        self.keep_array_indentation,
-        self.indent_level)
-
-
-class BeautifierFlags:
-    def __init__(self, mode):
-        self.previous_mode = 'BLOCK'
-        self.mode = mode
-        self.var_line = False
-        self.var_line_tainted = False
-        self.var_line_reindented = False
-        self.in_html_comment = False
-        self.if_line = False
-        self.in_case = False
-        self.eat_next_space = False
-        self.indentation_baseline = -1
-        self.indentation_level = 0
-        self.ternary_depth = 0
-
-
-def default_options():
-    return BeautifierOptions()
-
-
-def beautify(string, opts = default_options() ):
-    b = Beautifier()
-    return b.beautify(string, opts)
-
-
-def beautify_file(file_name, opts = default_options() ):
-
-    if file_name == '-': # stdin
-        f = sys.stdin
-    else:
-        f = open(file_name)
-
-    b = Beautifier()
-    return b.beautify(''.join(f.readlines()), opts)
-
-
-def usage():
-
-    print("""Javascript beautifier (http://jsbeautifier.org/)
-
-Usage: jsbeautifier.py [options] <infile>
-
-    <infile> can be "-", which means stdin.
-
-Input options:
-
- -i,  --stdin                      read input from stdin
-
-Output options:
-
- -s,  --indent-size=NUMBER         indentation size. (default 4).
- -c,  --indent-char=CHAR           character to indent with. (default space).
- -d,  --disable-preserve-newlines  do not preserve existing line breaks.
- -j,  --jslint-happy               more jslint-compatible output
- -b,  --brace-style=collapse       brace style (collapse, expand, end-expand)
- -k,  --keep-array-indentation     keep array indentation.
-
-Rarely needed options:
-
- -l,  --indent-level=NUMBER        initial indentation level. (default 0).
-
- -h,  --help, --usage              prints this help statement.
-
-""");
-
-
-
-
-
-
-class Beautifier:
-
-    def __init__(self, opts = default_options() ):
-
-        self.opts = opts
-        self.blank_state()
-
-    def blank_state(self):
-
-        # internal flags
-        self.flags = BeautifierFlags('BLOCK')
-        self.flag_store = []
-        self.wanted_newline = False
-        self.just_added_newline = False
-        self.do_block_just_closed = False
-
-
-        self.indent_string = self.opts.indent_char * self.opts.indent_size
-        self.last_word = ''              # last TK_WORD seen
-        self.last_type = 'TK_START_EXPR' # last token type
-        self.last_text = ''              # last token text
-        self.last_last_text = ''         # pre-last token text
-
-        self.input = None
-        self.output = []                 # formatted javascript gets built here
-
-        self.whitespace = ["\n", "\r", "\t", " "]
-        self.wordchar = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_$'
-        self.digits = '0123456789'
-        self.punct = '+ - * / % & ++ -- = += -= *= /= %= == === != !== > < >= <= >> << >>> >>>= >>= <<= && &= | || ! !! , : ? ^ ^= |= ::'.split(' ');
-
-
-        # Words which always should start on a new line
-        self.line_starters = 'continue,try,throw,return,var,if,switch,case,default,for,while,break,function'.split(',')
-        self.set_mode('BLOCK')
-
-        global parser_pos
-        parser_pos = 0
-
-
-    def beautify(self, s, opts = None ):
-
-        if opts != None:
-            self.opts = opts
-
-
-        if self.opts.brace_style not in ['expand', 'collapse', 'end-expand']:
-            raise(Exception('opts.brace_style must be "expand", "collapse" or "end-expand".'))
-
-        self.blank_state()
-
-        self.input = s
-
-        parser_pos = 0
-        while True:
-            token_text, token_type = self.get_next_token()
-            #print (token_text, token_type, self.flags.mode)
-            if token_type == 'TK_EOF':
-                break
-
-            handlers = {
-                'TK_START_EXPR': self.handle_start_expr,
-                'TK_END_EXPR': self.handle_end_expr,
-                'TK_START_BLOCK': self.handle_start_block,
-                'TK_END_BLOCK': self.handle_end_block,
-                'TK_WORD': self.handle_word,
-                'TK_SEMICOLON': self.handle_semicolon,
-                'TK_STRING': self.handle_string,
-                'TK_EQUALS': self.handle_equals,
-                'TK_OPERATOR': self.handle_operator,
-                'TK_BLOCK_COMMENT': self.handle_block_comment,
-                'TK_INLINE_COMMENT': self.handle_inline_comment,
-                'TK_COMMENT': self.handle_comment,
-                'TK_UNKNOWN': self.handle_unknown,
-            }
-
-            handlers[token_type](token_text)
-
-            self.last_last_text = self.last_text
-            self.last_type = token_type
-            self.last_text = token_text
-
-        return re.sub('[\n ]+$', '', ''.join(self.output))
-
-
-    def trim_output(self, eat_newlines = False):
-        while len(self.output) \
-              and (
-                  self.output[-1] == ' '\
-                  or self.output[-1] == self.indent_string \
-                  or (eat_newlines and self.output[-1] in ['\n', '\r'])):
-            self.output.pop()
-
-
-    def is_array(self, mode):
-        return mode in ['[EXPRESSION]', '[INDENDED-EXPRESSION]']
-
-
-    def is_expression(self, mode):
-        return mode in ['[EXPRESSION]', '[INDENDED-EXPRESSION]', '(EXPRESSION)']
-
-
-    def append_newline(self, ignore_repeated = True):
-
-        self.flags.eat_next_space = False;
-
-        if self.opts.keep_array_indentation and self.is_array(self.flags.mode):
-            return
-
-        self.flags.if_line = False;
-        self.trim_output();
-
-        if len(self.output) == 0:
-            # no newline on start of file
-            return
-
-        if self.output[-1] != '\n' or not ignore_repeated:
-            self.just_added_newline = True
-            self.output.append('\n')
-
-        for i in range(self.flags.indentation_level):
-            self.output.append(self.indent_string)
-
-        if self.flags.var_line and self.flags.var_line_reindented:
-            if self.opts.indent_char == ' ':
-                # var_line always pushes 4 spaces, so that the variables would be one under another
-                self.output.append('    ')
-            else:
-                self.output.append(self.indent_string)
-
-
-    def append(self, s):
-        if s == ' ':
-            # make sure only single space gets drawn
-            if self.flags.eat_next_space:
-                self.flags.eat_next_space = False
-            elif len(self.output) and self.output[-1] not in [' ', '\n', self.indent_string]:
-                self.output.append(' ')
-        else:
-            self.just_added_newline = False
-            self.flags.eat_next_space = False
-            self.output.append(s)
-
-
-    def indent(self):
-        self.flags.indentation_level = self.flags.indentation_level + 1
-
-
-    def remove_indent(self):
-        if len(self.output) and self.output[-1] == self.indent_string:
-            self.output.pop()
-
-
-    def set_mode(self, mode):
-
-        prev = BeautifierFlags('BLOCK')
-
-        if self.flags:
-            self.flag_store.append(self.flags)
-            prev = self.flags
-
-        self.flags = BeautifierFlags(mode)
-
-        if len(self.flag_store) == 1:
-            self.flags.indentation_level = self.opts.indent_level
-        else:
-            self.flags.indentation_level = prev.indentation_level
-            if prev.var_line and prev.var_line_reindented:
-                self.flags.indentation_level = self.flags.indentation_level + 1
-        self.flags.previous_mode = prev.mode
-
-
-    def restore_mode(self):
-        self.do_block_just_closed = self.flags.mode == 'DO_BLOCK'
-        if len(self.flag_store) > 0:
-            self.flags = self.flag_store.pop()
-
-
-    def get_next_token(self):
-
-        global parser_pos
-
-        self.n_newlines = 0
-
-        if parser_pos >= len(self.input):
-            return '', 'TK_EOF'
-
-        self.wanted_newline = False;
-        c = self.input[parser_pos]
-        parser_pos += 1
-
-        keep_whitespace = self.opts.keep_array_indentation and self.is_array(self.flags.mode)
-
-        if keep_whitespace:
-            # slight mess to allow nice preservation of array indentation and reindent that correctly
-            # first time when we get to the arrays:
-            # var a = [
-            # ....'something'
-            # we make note of whitespace_count = 4 into flags.indentation_baseline
-            # so we know that 4 whitespaces in original source match indent_level of reindented source
-            #
-            # and afterwards, when we get to
-            #    'something,
-            # .......'something else'
-            # we know that this should be indented to indent_level + (7 - indentation_baseline) spaces
-
-            whitespace_count = 0
-            while c in self.whitespace:
-                if c == '\n':
-                    self.trim_output()
-                    self.output.append('\n')
-                    self.just_added_newline = True
-                    whitespace_count = 0
-                elif c == '\t':
-                    whitespace_count += 4
-                elif c == '\r':
-                    pass
-                else:
-                    whitespace_count += 1
-
-                if parser_pos >= len(self.input):
-                    return '', 'TK_EOF'
-
-                c = self.input[parser_pos]
-                parser_pos += 1
-
-            if self.flags.indentation_baseline == -1:
-
-                self.flags.indentation_baseline = whitespace_count
-
-            if self.just_added_newline:
-                for i in range(self.flags.indentation_level + 1):
-                    self.output.append(self.indent_string)
-
-                if self.flags.indentation_baseline != -1:
-                    for i in range(whitespace_count - self.flags.indentation_baseline):
-                        self.output.append(' ')
-
-        else: # not keep_whitespace
-            while c in self.whitespace:
-                if c == '\n':
-                    if self.opts.max_preserve_newlines == 0 or self.opts.max_preserve_newlines > self.n_newlines:
-                        self.n_newlines += 1
-
-                if parser_pos >= len(self.input):
-                    return '', 'TK_EOF'
-
-                c = self.input[parser_pos]
-                parser_pos += 1
-
-            if self.opts.preserve_newlines and self.n_newlines > 1:
-                for i in range(self.n_newlines):
-                    self.append_newline(i == 0)
-                    self.just_added_newline = True
-
-            self.wanted_newline = self.n_newlines > 0
-
-
-        if c in self.wordchar:
-            if parser_pos < len(self.input):
-                while self.input[parser_pos] in self.wordchar:
-                    c = c + self.input[parser_pos]
-                    parser_pos += 1
-                    if parser_pos == len(self.input):
-                        break
-
-            # small and surprisingly unugly hack for 1E-10 representation
-            if parser_pos != len(self.input) and self.input[parser_pos] in '+-' \
-               and re.match('^[0-9]+[Ee]$', c):
-
-                sign = self.input[parser_pos]
-                parser_pos += 1
-                t = self.get_next_token()
-                c += sign + t[0]
-                return c, 'TK_WORD'
-
-            if c == 'in': # in is an operator, need to hack
-                return c, 'TK_OPERATOR'
-
-            if self.wanted_newline and \
-               self.last_type != 'TK_OPERATOR' and\
-               self.last_type != 'TK_EQUALS' and\
-               not self.flags.if_line and \
-               (self.opts.preserve_newlines or self.last_text != 'var'):
-                self.append_newline()
-
-            return c, 'TK_WORD'
-
-        if c in '([':
-            return c, 'TK_START_EXPR'
-
-        if c in ')]':
-            return c, 'TK_END_EXPR'
-
-        if c == '{':
-            return c, 'TK_START_BLOCK'
-
-        if c == '}':
-            return c, 'TK_END_BLOCK'
-
-        if c == ';':
-            return c, 'TK_SEMICOLON'
-
-        if c == '/':
-            comment = ''
-            inline_comment = True
-            comment_mode = 'TK_INLINE_COMMENT'
-            if self.input[parser_pos] == '*': # peek /* .. */ comment
-                parser_pos += 1
-                if parser_pos < len(self.input):
-                    while not (self.input[parser_pos] == '*' and \
-                               parser_pos + 1 < len(self.input) and \
-                               self.input[parser_pos + 1] == '/')\
-                          and parser_pos < len(self.input):
-                        c = self.input[parser_pos]
-                        comment += c
-                        if c in '\r\n':
-                            comment_mode = 'TK_BLOCK_COMMENT'
-                        parser_pos += 1
-                        if parser_pos >= len(self.input):
-                            break
-                parser_pos += 2
-                return '/*' + comment + '*/', comment_mode
-            if self.input[parser_pos] == '/': # peek // comment
-                comment = c
-                while self.input[parser_pos] not in '\r\n':
-                    comment += self.input[parser_pos]
-                    parser_pos += 1
-                    if parser_pos >= len(self.input):
-                        break
-                parser_pos += 1
-                if self.wanted_newline:
-                    self.append_newline()
-                return comment, 'TK_COMMENT'
-
-
-
-        if c == "'" or c == '"' or \
-           (c == '/' and ((self.last_type == 'TK_WORD' and self.last_text in ['return', 'do']) or \
-                          (self.last_type in ['TK_COMMENT', 'TK_START_EXPR', 'TK_START_BLOCK', 'TK_END_BLOCK', 'TK_OPERATOR',
-                                              'TK_EQUALS', 'TK_EOF', 'TK_SEMICOLON']))):
-             sep = c
-             esc = False
-             resulting_string = c
-             in_char_class = False
-
-             if parser_pos < len(self.input):
-                if sep == '/':
-                    # handle regexp
-                    in_char_class = False
-                    while esc or in_char_class or self.input[parser_pos] != sep:
-                        resulting_string += self.input[parser_pos]
-                        if not esc:
-                            esc = self.input[parser_pos] == '\\'
-                            if self.input[parser_pos] == '[':
-                                in_char_class = True
-                            elif self.input[parser_pos] == ']':
-                                in_char_class = False
-                        else:
-                            esc = False
-                        parser_pos += 1
-                        if parser_pos >= len(self.input):
-                            # incomplete regex when end-of-file reached
-                            # bail out with what has received so far
-                            return resulting_string, 'TK_STRING'
-                else:
-                    # handle string
-                    while esc or self.input[parser_pos] != sep:
-                        resulting_string += self.input[parser_pos]
-                        if not esc:
-                            esc = self.input[parser_pos] == '\\'
-                        else:
-                            esc = False
-                        parser_pos += 1
-                        if parser_pos >= len(self.input):
-                            # incomplete string when end-of-file reached
-                            # bail out with what has received so far
-                            return resulting_string, 'TK_STRING'
-
-
-             parser_pos += 1
-             resulting_string += sep
-             if sep == '/':
-                 # regexps may have modifiers /regexp/MOD, so fetch those too
-                 while parser_pos < len(self.input) and self.input[parser_pos] in self.wordchar:
-                     resulting_string += self.input[parser_pos]
-                     parser_pos += 1
-             return resulting_string, 'TK_STRING'
-
-        if c == '#':
-
-            # she-bang
-            if len(self.output) == 0 and len(self.input) > 1 and self.input[parser_pos] == '!':
-                resulting_string = c
-                while parser_pos < len(self.input) and c != '\n':
-                    c = self.input[parser_pos]
-                    resulting_string += c
-                    parser_pos += 1
-                self.output.append(resulting_string.strip() + "\n")
-                self.append_newline()
-                return self.get_next_token()
-
-
-            # Spidermonkey-specific sharp variables for circular references
-            # https://developer.mozilla.org/En/Sharp_variables_in_JavaScript
-            # http://mxr.mozilla.org/mozilla-central/source/js/src/jsscan.cpp around line 1935
-            sharp = '#'
-            if parser_pos < len(self.input) and self.input[parser_pos] in self.digits:
-                while True:
-                    c = self.input[parser_pos]
-                    sharp += c
-                    parser_pos += 1
-                    if parser_pos >= len(self.input)  or c == '#' or c == '=':
-                        break
-            if c == '#' or parser_pos >= len(self.input):
-                pass
-            elif self.input[parser_pos] == '[' and self.input[parser_pos + 1] == ']':
-                sharp += '[]'
-                parser_pos += 2
-            elif self.input[parser_pos] == '{' and self.input[parser_pos + 1] == '}':
-                sharp += '{}'
-                parser_pos += 2
-            return sharp, 'TK_WORD'
-
-        if c == '<' and self.input[parser_pos - 1 : parser_pos + 3] == '<!--':
-            parser_pos += 3
-            self.flags.in_html_comment = True
-            return '<!--', 'TK_COMMENT'
-
-        if c == '-' and self.flags.in_html_comment and self.input[parser_pos - 1 : parser_pos + 2] == '-->':
-            self.flags.in_html_comment = False
-            parser_pos += 2
-            if self.wanted_newline:
-                self.append_newline()
-            return '-->', 'TK_COMMENT'
-
-        if c in self.punct:
-            while parser_pos < len(self.input) and c + self.input[parser_pos] in self.punct:
-                c += self.input[parser_pos]
-                parser_pos += 1
-                if parser_pos >= len(self.input):
-                    break
-            if c == '=':
-                return c, 'TK_EQUALS'
-            else:
-                return c, 'TK_OPERATOR'
-        return c, 'TK_UNKNOWN'
-
-
-
-    def handle_start_expr(self, token_text):
-        if token_text == '[':
-            if self.last_type == 'TK_WORD' or self.last_text == ')':
-                if self.last_text in self.line_starters:
-                    self.append(' ')
-                self.set_mode('(EXPRESSION)')
-                self.append(token_text)
-                return
-
-            if self.flags.mode in ['[EXPRESSION]', '[INDENTED-EXPRESSION]']:
-                if self.last_last_text == ']' and self.last_text == ',':
-                    # ], [ goes to a new line
-                    if self.flags.mode == '[EXPRESSION]':
-                        self.flags.mode = '[INDENTED-EXPRESSION]'
-                        if not self.opts.keep_array_indentation:
-                            self.indent()
-                    self.set_mode('[EXPRESSION]')
-                    if not self.opts.keep_array_indentation:
-                        self.append_newline()
-                elif self.last_text == '[':
-                    if self.flags.mode == '[EXPRESSION]':
-                        self.flags.mode = '[INDENTED-EXPRESSION]'
-                        if not self.opts.keep_array_indentation:
-                            self.indent()
-                    self.set_mode('[EXPRESSION]')
-
-                    if not self.opts.keep_array_indentation:
-                        self.append_newline()
-                else:
-                    self.set_mode('[EXPRESSION]')
-            else:
-                self.set_mode('[EXPRESSION]')
-        else:
-            self.set_mode('(EXPRESSION)')
-
-
-        if self.last_text == ';' or self.last_type == 'TK_START_BLOCK':
-            self.append_newline()
-        elif self.last_type in ['TK_END_EXPR', 'TK_START_EXPR', 'TK_END_BLOCK'] or self.last_text == '.':
-            # do nothing on (( and )( and ][ and ]( and .(
-            pass
-        elif self.last_type not in ['TK_WORD', 'TK_OPERATOR']:
-            self.append(' ')
-        elif self.last_word == 'function' or self.last_word == 'typeof':
-            # function() vs function (), typeof() vs typeof ()
-            if self.opts.jslint_happy:
-                self.append(' ')
-        elif self.last_text in self.line_starters or self.last_text == 'catch':
-            self.append(' ')
-
-        self.append(token_text)
-
-
-    def handle_end_expr(self, token_text):
-        if token_text == ']':
-            if self.opts.keep_array_indentation:
-                if self.last_text == '}':
-                    self.remove_indent()
-                    self.append(token_text)
-                    self.restore_mode()
-                    return
-            else:
-                if self.flags.mode == '[INDENTED-EXPRESSION]':
-                    if self.last_text == ']':
-                        self.restore_mode()
-                        self.append_newline()
-                        self.append(token_text)
-                        return
-        self.restore_mode()
-        self.append(token_text)
-
-
-    def handle_start_block(self, token_text):
-        if self.last_word == 'do':
-            self.set_mode('DO_BLOCK')
-        else:
-            self.set_mode('BLOCK')
-
-        if self.opts.brace_style == 'expand':
-            if self.last_type != 'TK_OPERATOR':
-                if self.last_text in ['return', '=']:
-                    self.append(' ')
-                else:
-                    self.append_newline(True)
-
-            self.append(token_text)
-            self.indent()
-        else:
-            if self.last_type not in ['TK_OPERATOR', 'TK_START_EXPR']:
-                if self.last_type == 'TK_START_BLOCK':
-                    self.append_newline()
-                else:
-                    self.append(' ')
-            else:
-                # if TK_OPERATOR or TK_START_EXPR
-                if self.is_array(self.flags.previous_mode) and self.last_text == ',':
-                    if self.last_last_text == '}':
-                        self.append(' ')
-                    else:
-                        self.append_newline()
-            self.indent()
-            self.append(token_text)
-
-
-
-
-
-    def handle_end_block(self, token_text):
-        self.restore_mode()
-        if self.opts.brace_style == 'expand':
-            if self.last_text != '{':
-                self.append_newline()
-        else:
-            if self.last_type == 'TK_START_BLOCK':
-                if self.just_added_newline:
-                    self.remove_indent()
-                else:
-                    # {}
-                    self.trim_output()
-            else:
-                if self.is_array(self.flags.mode) and self.opts.keep_array_indentation:
-                    self.opts.keep_array_indentation = False
-                    self.append_newline()
-                    self.opts.keep_array_indentation = True
-                else:
-                    self.append_newline()
-
-        self.append(token_text)
-
-
-    def handle_word(self, token_text):
-        if self.do_block_just_closed:
-            self.append(' ')
-            self.append(token_text)
-            self.append(' ')
-            self.do_block_just_closed = False
-            return
-
-        if token_text == 'function':
-
-            if self.flags.var_line:
-                self.flags.var_line_reindented = True
-            if (self.just_added_newline or self.last_text == ';') and self.last_text != '{':
-                # make sure there is a nice clean space of at least one blank line
-                # before a new function definition
-                have_newlines = self.n_newlines
-                if not self.just_added_newline:
-                    have_newlines = 0
-                if not self.opts.preserve_newlines:
-                    have_newlines = 1
-                for i in range(2 - have_newlines):
-                    self.append_newline(False)
-
-        if token_text in ['case', 'default']:
-            if self.last_text == ':':
-                self.remove_indent()
-            else:
-                self.flags.indentation_level -= 1
-                self.append_newline()
-                self.flags.indentation_level += 1
-            self.append(token_text)
-            self.flags.in_case = True
-            return
-
-        prefix = 'NONE'
-
-        if self.last_type == 'TK_END_BLOCK':
-            if token_text not in ['else', 'catch', 'finally']:
-                prefix = 'NEWLINE'
-            else:
-                if self.opts.brace_style in ['expand', 'end-expand']:
-                    prefix = 'NEWLINE'
-                else:
-                    prefix = 'SPACE'
-                    self.append(' ')
-        elif self.last_type == 'TK_SEMICOLON' and self.flags.mode in ['BLOCK', 'DO_BLOCK']:
-            prefix = 'NEWLINE'
-        elif self.last_type == 'TK_SEMICOLON' and self.is_expression(self.flags.mode):
-            prefix = 'SPACE'
-        elif self.last_type == 'TK_STRING':
-            prefix = 'NEWLINE'
-        elif self.last_type == 'TK_WORD':
-            if self.last_text == 'else':
-                # eat newlines between ...else *** some_op...
-                # won't preserve extra newlines in this place (if any), but don't care that much
-                self.trim_output(True);
-            prefix = 'SPACE'
-        elif self.last_type == 'TK_START_BLOCK':
-            prefix = 'NEWLINE'
-        elif self.last_type == 'TK_END_EXPR':
-            self.append(' ')
-            prefix = 'NEWLINE'
-
-        if self.flags.if_line and self.last_type == 'TK_END_EXPR':
-            self.flags.if_line = False
-
-        if token_text in self.line_starters:
-            if self.last_text == 'else':
-                prefix = 'SPACE'
-            else:
-                prefix = 'NEWLINE'
-
-        if token_text in ['else', 'catch', 'finally']:
-            if self.last_type != 'TK_END_BLOCK' \
-               or self.opts.brace_style == 'expand' \
-               or self.opts.brace_style == 'end-expand':
-                self.append_newline()
-            else:
-                self.trim_output(True)
-                self.append(' ')
-        elif prefix == 'NEWLINE':
-            if token_text == 'function' and (self.last_type == 'TK_START_EXPR' or self.last_text in '=,'):
-                # no need to force newline on "function" -
-                #   (function...
-                pass
-            elif token_text == 'function' and self.last_text == 'new':
-                self.append(' ')
-            elif self.last_text in ['return', 'throw']:
-                # no newline between return nnn
-                self.append(' ')
-            elif self.last_type != 'TK_END_EXPR':
-                if (self.last_type != 'TK_START_EXPR' or token_text != 'var') and self.last_text != ':':
-                    # no need to force newline on VAR -
-                    # for (var x = 0...
-                    if token_text == 'if' and self.last_word == 'else' and self.last_text != '{':
-                        self.append(' ')
-                    else:
-                        self.flags.var_line = False
-                        self.flags.var_line_reindented = False
-                        self.append_newline()
-            elif token_text in self.line_starters and self.last_text != ')':
-                self.flags.var_line = False
-                self.flags.var_line_reindented = False
-                self.append_newline()
-        elif self.is_array(self.flags.mode) and self.last_text == ',' and self.last_last_text == '}':
-                self.append_newline() # }, in lists get a newline
-        elif prefix == 'SPACE':
-            self.append(' ')
-
-
-        self.append(token_text)
-        self.last_word = token_text
-
-        if token_text == 'var':
-            self.flags.var_line = True
-            self.flags.var_line_reindented = False
-            self.flags.var_line_tainted = False
-
-
-        if token_text == 'if':
-            self.flags.if_line = True
-
-        if token_text == 'else':
-            self.flags.if_line = False
-
-
-    def handle_semicolon(self, token_text):
-        self.append(token_text)
-        self.flags.var_line = False
-        self.flags.var_line_reindented = False
-        if self.flags.mode == 'OBJECT':
-            # OBJECT mode is weird and doesn't get reset too well.
-            self.flags.mode = 'BLOCK'
-
-
-    def handle_string(self, token_text):
-        if self.last_type in ['TK_START_BLOCK', 'TK_END_BLOCK', 'TK_SEMICOLON']:
-            self.append_newline()
-        elif self.last_type == 'TK_WORD':
-            self.append(' ')
-
-        self.append(token_text)
-
-
-    def handle_equals(self, token_text):
-        if self.flags.var_line:
-            # just got an '=' in a var-line, different line breaking rules will apply
-            self.flags.var_line_tainted = True
-
-        self.append(' ')
-        self.append(token_text)
-        self.append(' ')
-
-
-    def handle_operator(self, token_text):
-        space_before = True
-        space_after = True
-
-        if self.flags.var_line and token_text == ',' and self.is_expression(self.flags.mode):
-            # do not break on comma, for ( var a = 1, b = 2
-            self.flags.var_line_tainted = False
-
-        if self.flags.var_line and token_text == ',':
-            if self.flags.var_line_tainted:
-                self.append(token_text)
-                self.flags.var_line_reindented = True
-                self.flags.var_line_tainted = False
-                self.append_newline()
-                return
-            else:
-                self.flags.var_line_tainted = False
-
-        if self.last_text in ['return', 'throw']:
-            # return had a special handling in TK_WORD
-            self.append(' ')
-            self.append(token_text)
-            return
-
-        if token_text == ':' and self.flags.in_case:
-            self.append(token_text)
-            self.append_newline()
-            self.flags.in_case = False
-            return
-
-        if token_text == '::':
-            # no spaces around the exotic namespacing syntax operator
-            self.append(token_text)
-            return
-
-        if token_text == ',':
-            if self.flags.var_line:
-                if self.flags.var_line_tainted:
-                    # This never happens, as it's handled previously, right?
-                    self.append(token_text)
-                    self.append_newline()
-                    self.flags.var_line_tainted = False
-                else:
-                    self.append(token_text)
-                    self.append(' ')
-            elif self.last_type == 'TK_END_BLOCK' and self.flags.mode != '(EXPRESSION)':
-                self.append(token_text)
-                if self.flags.mode == 'OBJECT' and self.last_text == '}':
-                    self.append_newline()
-                else:
-                    self.append(' ')
-            else:
-                if self.flags.mode == 'OBJECT':
-                    self.append(token_text)
-                    self.append_newline()
-                else:
-                    # EXPR or DO_BLOCK
-                    self.append(token_text)
-                    self.append(' ')
-            # comma handled
-            return
-        elif token_text in ['--', '++', '!'] \
-                or (token_text in ['+', '-'] \
-                    and self.last_type in ['TK_START_BLOCK', 'TK_START_EXPR', 'TK_EQUALS', 'TK_OPERATOR']) \
-                or self.last_text in self.line_starters:
-
-            space_before = False
-            space_after = False
-
-            if self.last_text == ';' and self.is_expression(self.flags.mode):
-                # for (;; ++i)
-                #         ^^
-                space_before = True
-
-            if self.last_type == 'TK_WORD' and self.last_text in self.line_starters:
-                space_before = True
-
-            if self.flags.mode == 'BLOCK' and self.last_text in ['{', ';']:
-                # { foo: --i }
-                # foo(): --bar
-                self.append_newline()
-
-        elif token_text == '.':
-            # decimal digits or object.property
-            space_before = False
-
-        elif token_text == ':':
-            if self.flags.ternary_depth == 0:
-                self.flags.mode = 'OBJECT'
-                space_before = False
-            else:
-                self.flags.ternary_depth -= 1
-        elif token_text == '?':
-            self.flags.ternary_depth += 1
-
-        if space_before:
-            self.append(' ')
-
-        self.append(token_text)
-
-        if space_after:
-            self.append(' ')
-
-
-
-
-    def handle_block_comment(self, token_text):
-
-        lines = token_text.replace('\x0d', '').split('\x0a')
-        if token_text[:3] == '/**':
-            # javadoc: reformat and reindent
-            self.append_newline()
-            self.append(lines[0])
-            for line in lines[1:]:
-                self.append_newline()
-                self.append(' ' + line.strip())
-        else:
-            # simple block comment: leave intact
-            if len(lines) > 1:
-                # multiline comment starts on a new line
-                self.append_newline()
-                self.trim_output()
-            else:
-                # single line /* ... */ comment stays on the same line
-                self.append(' ')
-            for line in lines:
-                self.append(line)
-                self.append('\n')
-        self.append_newline()
-
-
-    def handle_inline_comment(self, token_text):
-        self.append(' ')
-        self.append(token_text)
-        if self.is_expression(self.flags.mode):
-            self.append(' ')
-        else:
-            self.append_newline()
-
-
-    def handle_comment(self, token_text):
-        if self.wanted_newline:
-            self.append_newline()
-        else:
-            self.append(' ')
-
-        self.append(token_text)
-        self.append_newline()
-
-
-    def handle_unknown(self, token_text):
-        if self.last_text in ['return', 'throw']:
-            self.append(' ')
-
-        self.append(token_text)
-
-
-
-
-
-def main():
-
-    argv = sys.argv[1:]
-
-    try:
-        opts, args = getopt.getopt(argv, "s:c:djbkil:h", ['indent-size=','indent-char=', 'disable-preserve-newlines',
-                                                          'jslint-happy', 'brace-style=',
-                                                          'keep-array-indentation', 'indent-level=', 'help',
-                                                          'usage', 'stdin'])
-    except getopt.GetoptError:
-        usage()
-        sys.exit(2)
-
-    js_options = default_options()
-
-    file = None
-    if len(args) == 1:
-        file = args[0]
-
-    for opt, arg in opts:
-        if opt in ('--keep-array-indentation', '-k'):
-            js_options.keep_array_indentation = True
-        if opt in ('--indent-size', '-s'):
-            js_options.indent_size = int(arg)
-        elif opt in ('--indent-char', '-c'):
-            js_options.indent_char = arg
-        elif opt in ('--disable-preserve_newlines', '-d'):
-            js_options.preserve_newlines = False
-        elif opt in ('--jslint-happy', '-j'):
-            js_options.jslint_happy = True
-        elif opt in ('--brace-style', '-b'):
-            js_options.brace_style = arg
-        elif opt in ('--indent-level', '-l'):
-            js_options.indent_level = int(arg)
-        elif opt in ('--stdin', '-i'):
-            file = '-'
-        elif opt in ('--help', '--usage', '--h'):
-            return usage()
-
-    if file == None:
-        return usage()
-    else:
-        print(beautify_file(file, js_options))
-
-
-
-if __name__ == "__main__":
-    main()
-
-
diff --git a/bundles/javascript.tmbundle/Syntaxes/JavaScript.plist b/bundles/javascript.tmbundle/Syntaxes/JavaScript.plist
deleted file mode 100644
index 0f8de7e3b..000000000
--- a/bundles/javascript.tmbundle/Syntaxes/JavaScript.plist
+++ /dev/null
@@ -1,712 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>comment</key>
-	<string>JavaScript Syntax: version 2.0</string>
-	<key>fileTypes</key>
-	<array>
-		<string>js</string>
-		<string>htc</string>
-		<string>jsx</string>
-	</array>
-	<key>foldingStartMarker</key>
-	<string>^.*\bfunction\s*(\w+\s*)?\([^\)]*\)(\s*\{[^\}]*)?\s*$</string>
-	<key>foldingStopMarker</key>
-	<string>^\s*\}</string>
-	<key>keyEquivalent</key>
-	<string>^~J</string>
-	<key>name</key>
-	<string>JavaScript</string>
-	<key>patterns</key>
-	<array>
-		<dict>
-			<key>captures</key>
-			<dict>
-				<key>1</key>
-				<dict>
-					<key>name</key>
-					<string>support.class.js</string>
-				</dict>
-				<key>2</key>
-				<dict>
-					<key>name</key>
-					<string>support.constant.js</string>
-				</dict>
-				<key>3</key>
-				<dict>
-					<key>name</key>
-					<string>keyword.operator.js</string>
-				</dict>
-			</dict>
-			<key>comment</key>
-			<string>match stuff like: Sound.prototype = { … } when extending an object</string>
-			<key>match</key>
-			<string>([a-zA-Z_?.$][\w?.$]*)\.(prototype)\s*(=)\s*</string>
-			<key>name</key>
-			<string>meta.class.js</string>
-		</dict>
-		<dict>
-			<key>captures</key>
-			<dict>
-				<key>1</key>
-				<dict>
-					<key>name</key>
-					<string>support.class.js</string>
-				</dict>
-				<key>2</key>
-				<dict>
-					<key>name</key>
-					<string>support.constant.js</string>
-				</dict>
-				<key>3</key>
-				<dict>
-					<key>name</key>
-					<string>entity.name.function.js</string>
-				</dict>
-				<key>4</key>
-				<dict>
-					<key>name</key>
-					<string>keyword.operator.js</string>
-				</dict>
-				<key>5</key>
-				<dict>
-					<key>name</key>
-					<string>storage.type.function.js</string>
-				</dict>
-				<key>6</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.parameters.begin.js</string>
-				</dict>
-				<key>7</key>
-				<dict>
-					<key>name</key>
-					<string>variable.parameter.function.js</string>
-				</dict>
-				<key>8</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.parameters.end.js</string>
-				</dict>
-			</dict>
-			<key>comment</key>
-			<string>match stuff like: Sound.prototype.play = function() { … }</string>
-			<key>match</key>
-			<string>([a-zA-Z_?.$][\w?.$]*)\.(prototype)\.([a-zA-Z_?.$][\w?.$]*)\s*(=)\s*(function)?\s*(\()(.*?)(\))</string>
-			<key>name</key>
-			<string>meta.function.prototype.js</string>
-		</dict>
-		<dict>
-			<key>captures</key>
-			<dict>
-				<key>1</key>
-				<dict>
-					<key>name</key>
-					<string>support.class.js</string>
-				</dict>
-				<key>2</key>
-				<dict>
-					<key>name</key>
-					<string>support.constant.js</string>
-				</dict>
-				<key>3</key>
-				<dict>
-					<key>name</key>
-					<string>entity.name.function.js</string>
-				</dict>
-				<key>4</key>
-				<dict>
-					<key>name</key>
-					<string>keyword.operator.js</string>
-				</dict>
-			</dict>
-			<key>comment</key>
-			<string>match stuff like: Sound.prototype.play = myfunc</string>
-			<key>match</key>
-			<string>([a-zA-Z_?.$][\w?.$]*)\.(prototype)\.([a-zA-Z_?.$][\w?.$]*)\s*(=)\s*</string>
-			<key>name</key>
-			<string>meta.function.js</string>
-		</dict>
-		<dict>
-			<key>captures</key>
-			<dict>
-				<key>1</key>
-				<dict>
-					<key>name</key>
-					<string>support.class.js</string>
-				</dict>
-				<key>2</key>
-				<dict>
-					<key>name</key>
-					<string>entity.name.function.js</string>
-				</dict>
-				<key>3</key>
-				<dict>
-					<key>name</key>
-					<string>keyword.operator.js</string>
-				</dict>
-				<key>4</key>
-				<dict>
-					<key>name</key>
-					<string>storage.type.function.js</string>
-				</dict>
-				<key>5</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.parameters.begin.js</string>
-				</dict>
-				<key>6</key>
-				<dict>
-					<key>name</key>
-					<string>variable.parameter.function.js</string>
-				</dict>
-				<key>7</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.parameters.end.js</string>
-				</dict>
-			</dict>
-			<key>comment</key>
-			<string>match stuff like: Sound.play = function() { … }</string>
-			<key>match</key>
-			<string>([a-zA-Z_?.$][\w?.$]*)\.([a-zA-Z_?.$][\w?.$]*)\s*(=)\s*(function)\s*(\()(.*?)(\))</string>
-			<key>name</key>
-			<string>meta.function.js</string>
-		</dict>
-		<dict>
-			<key>captures</key>
-			<dict>
-				<key>1</key>
-				<dict>
-					<key>name</key>
-					<string>entity.name.function.js</string>
-				</dict>
-				<key>2</key>
-				<dict>
-					<key>name</key>
-					<string>keyword.operator.js</string>
-				</dict>
-				<key>3</key>
-				<dict>
-					<key>name</key>
-					<string>storage.type.function.js</string>
-				</dict>
-				<key>4</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.parameters.begin.js</string>
-				</dict>
-				<key>5</key>
-				<dict>
-					<key>name</key>
-					<string>variable.parameter.function.js</string>
-				</dict>
-				<key>6</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.parameters.end.js</string>
-				</dict>
-			</dict>
-			<key>comment</key>
-			<string>match stuff like: play = function() { … }</string>
-			<key>match</key>
-			<string>([a-zA-Z_?$][\w?$]*)\s*(=)\s*(function)\s*(\()(.*?)(\))</string>
-			<key>name</key>
-			<string>meta.function.js</string>
-		</dict>
-		<dict>
-			<key>captures</key>
-			<dict>
-				<key>1</key>
-				<dict>
-					<key>name</key>
-					<string>storage.type.function.js</string>
-				</dict>
-				<key>2</key>
-				<dict>
-					<key>name</key>
-					<string>entity.name.function.js</string>
-				</dict>
-				<key>3</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.parameters.begin.js</string>
-				</dict>
-				<key>4</key>
-				<dict>
-					<key>name</key>
-					<string>variable.parameter.function.js</string>
-				</dict>
-				<key>5</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.parameters.end.js</string>
-				</dict>
-			</dict>
-			<key>comment</key>
-			<string>match regular function like: function myFunc(arg) { … }</string>
-			<key>match</key>
-			<string>\b(function)\s+([a-zA-Z_$]\w*)?\s*(\()(.*?)(\))</string>
-			<key>name</key>
-			<string>meta.function.js</string>
-		</dict>
-		<dict>
-			<key>captures</key>
-			<dict>
-				<key>1</key>
-				<dict>
-					<key>name</key>
-					<string>entity.name.function.js</string>
-				</dict>
-				<key>2</key>
-				<dict>
-					<key>name</key>
-					<string>storage.type.function.js</string>
-				</dict>
-				<key>3</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.parameters.begin.js</string>
-				</dict>
-				<key>4</key>
-				<dict>
-					<key>name</key>
-					<string>variable.parameter.function.js</string>
-				</dict>
-				<key>5</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.parameters.end.js</string>
-				</dict>
-			</dict>
-			<key>comment</key>
-			<string>match stuff like: foobar: function() { … }</string>
-			<key>match</key>
-			<string>\b([a-zA-Z_?.$][\w?.$]*)\s*:\s*\b(function)?\s*(\()(.*?)(\))</string>
-			<key>name</key>
-			<string>meta.function.json.js</string>
-		</dict>
-		<dict>
-			<key>captures</key>
-			<dict>
-				<key>1</key>
-				<dict>
-					<key>name</key>
-					<string>string.quoted.single.js</string>
-				</dict>
-				<key>10</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.parameters.begin.js</string>
-				</dict>
-				<key>11</key>
-				<dict>
-					<key>name</key>
-					<string>variable.parameter.function.js</string>
-				</dict>
-				<key>12</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.parameters.end.js</string>
-				</dict>
-				<key>2</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.begin.js</string>
-				</dict>
-				<key>3</key>
-				<dict>
-					<key>name</key>
-					<string>entity.name.function.js</string>
-				</dict>
-				<key>4</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.end.js</string>
-				</dict>
-				<key>5</key>
-				<dict>
-					<key>name</key>
-					<string>string.quoted.double.js</string>
-				</dict>
-				<key>6</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.begin.js</string>
-				</dict>
-				<key>7</key>
-				<dict>
-					<key>name</key>
-					<string>entity.name.function.js</string>
-				</dict>
-				<key>8</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.end.js</string>
-				</dict>
-				<key>9</key>
-				<dict>
-					<key>name</key>
-					<string>entity.name.function.js</string>
-				</dict>
-			</dict>
-			<key>comment</key>
-			<string>Attempt to match "foo": function</string>
-			<key>match</key>
-			<string>(?:((')(.*?)('))|((")(.*?)(")))\s*:\s*\b(function)?\s*(\()(.*?)(\))</string>
-			<key>name</key>
-			<string>meta.function.json.js</string>
-		</dict>
-		<dict>
-			<key>captures</key>
-			<dict>
-				<key>1</key>
-				<dict>
-					<key>name</key>
-					<string>keyword.operator.new.js</string>
-				</dict>
-				<key>2</key>
-				<dict>
-					<key>name</key>
-					<string>entity.name.type.instance.js</string>
-				</dict>
-			</dict>
-			<key>match</key>
-			<string>(new)\s+(\w+(?:\.\w*)?)</string>
-			<key>name</key>
-			<string>meta.class.instance.constructor</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>\b(console)\b</string>
-			<key>name</key>
-			<string>entity.name.type.object.js.firebug</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>\.(warn|info|log|error|time|timeEnd|assert)\b</string>
-			<key>name</key>
-			<string>support.function.js.firebug</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>\b((0(x|X)[0-9a-fA-F]+)|([0-9]+(\.[0-9]+)?))\b</string>
-			<key>name</key>
-			<string>constant.numeric.js</string>
-		</dict>
-		<dict>
-			<key>begin</key>
-			<string>'</string>
-			<key>beginCaptures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.begin.js</string>
-				</dict>
-			</dict>
-			<key>end</key>
-			<string>'</string>
-			<key>endCaptures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.end.js</string>
-				</dict>
-			</dict>
-			<key>name</key>
-			<string>string.quoted.single.js</string>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>match</key>
-					<string>\\(x\h{2}|[0-2][0-7]{,2}|3[0-6][0-7]?|37[0-7]?|[4-7][0-7]?|.)</string>
-					<key>name</key>
-					<string>constant.character.escape.js</string>
-				</dict>
-			</array>
-		</dict>
-		<dict>
-			<key>begin</key>
-			<string>"</string>
-			<key>beginCaptures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.begin.js</string>
-				</dict>
-			</dict>
-			<key>end</key>
-			<string>"</string>
-			<key>endCaptures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.end.js</string>
-				</dict>
-			</dict>
-			<key>name</key>
-			<string>string.quoted.double.js</string>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>match</key>
-					<string>\\(x\h{2}|[0-2][0-7]{,2}|3[0-6][0-7]|37[0-7]?|[4-7][0-7]?|.)</string>
-					<key>name</key>
-					<string>constant.character.escape.js</string>
-				</dict>
-			</array>
-		</dict>
-		<dict>
-			<key>begin</key>
-			<string>/\*\*(?!/)</string>
-			<key>captures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.comment.js</string>
-				</dict>
-			</dict>
-			<key>end</key>
-			<string>\*/</string>
-			<key>name</key>
-			<string>comment.block.documentation.js</string>
-		</dict>
-		<dict>
-			<key>begin</key>
-			<string>/\*</string>
-			<key>captures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.comment.js</string>
-				</dict>
-			</dict>
-			<key>end</key>
-			<string>\*/</string>
-			<key>name</key>
-			<string>comment.block.js</string>
-		</dict>
-		<dict>
-			<key>captures</key>
-			<dict>
-				<key>1</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.comment.js</string>
-				</dict>
-			</dict>
-			<key>match</key>
-			<string>(//).*$\n?</string>
-			<key>name</key>
-			<string>comment.line.double-slash.js</string>
-		</dict>
-		<dict>
-			<key>captures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.comment.html.js</string>
-				</dict>
-				<key>2</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.comment.html.js</string>
-				</dict>
-			</dict>
-			<key>match</key>
-			<string>(&lt;!--|--&gt;)</string>
-			<key>name</key>
-			<string>comment.block.html.js</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>\b(boolean|byte|char|class|double|enum|float|function|int|interface|long|short|var|void)\b</string>
-			<key>name</key>
-			<string>storage.type.js</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>\b(const|export|extends|final|implements|native|private|protected|public|static|synchronized|throws|transient|volatile)\b</string>
-			<key>name</key>
-			<string>storage.modifier.js</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>\b(break|case|catch|continue|default|do|else|finally|for|goto|if|import|package|return|switch|throw|try|while)\b</string>
-			<key>name</key>
-			<string>keyword.control.js</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>\b(delete|in|instanceof|new|typeof|with)\b</string>
-			<key>name</key>
-			<string>keyword.operator.js</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>\btrue\b</string>
-			<key>name</key>
-			<string>constant.language.boolean.true.js</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>\bfalse\b</string>
-			<key>name</key>
-			<string>constant.language.boolean.false.js</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>\bnull\b</string>
-			<key>name</key>
-			<string>constant.language.null.js</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>\b(super|this)\b</string>
-			<key>name</key>
-			<string>variable.language.js</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>\b(debugger)\b</string>
-			<key>name</key>
-			<string>keyword.other.js</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>\b(Anchor|Applet|Area|Array|Boolean|Button|Checkbox|Date|document|event|FileUpload|Form|Frame|Function|Hidden|History|Image|JavaArray|JavaClass|JavaObject|JavaPackage|java|Layer|Link|Location|Math|MimeType|Number|navigator|netscape|Object|Option|Packages|Password|Plugin|Radio|RegExp|Reset|Select|String|Style|Submit|screen|sun|Text|Textarea|window|XMLHttpRequest)\b</string>
-			<key>name</key>
-			<string>support.class.js</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>\b(s(h(ift|ow(Mod(elessDialog|alDialog)|Help))|croll(X|By(Pages|Lines)?|Y|To)?|t(op|rike)|i(n|zeToContent|debar|gnText)|ort|u(p|b(str(ing)?)?)|pli(ce|t)|e(nd|t(Re(sizable|questHeader)|M(i(nutes|lliseconds)|onth)|Seconds|Ho(tKeys|urs)|Year|Cursor|Time(out)?|Interval|ZOptions|Date|UTC(M(i(nutes|lliseconds)|onth)|Seconds|Hours|Date|FullYear)|FullYear|Active)|arch)|qrt|lice|avePreferences|mall)|h(ome|andleEvent)|navigate|c(har(CodeAt|At)|o(s|n(cat|textual|firm)|mpile)|eil|lear(Timeout|Interval)?|a(ptureEvents|ll)|reate(StyleSheet|Popup|EventObject))|t(o(GMTString|S(tring|ource)|U(TCString|pperCase)|Lo(caleString|werCase))|est|a(n|int(Enabled)?))|i(s(NaN|Finite)|ndexOf|talics)|d(isableExternalCapture|ump|etachEvent)|u(n(shift|taint|escape|watch)|pdateCommands)|j(oin|avaEnabled)|p(o(p|w)|ush|lugins.refresh|a(ddings|rse(Int|Float)?)|r(int|ompt|eference))|e(scape|nableExternalCapture|val|lementFromPoint|x(p|ec(Script|Command)?))|valueOf|UTC|queryCommand(State|Indeterm|Enabled|Value)|f(i(nd|le(ModifiedDate|Size|CreatedDate|UpdatedDate)|xed)|o(nt(size|color)|rward)|loor|romCharCode)|watch|l(ink|o(ad|g)|astIndexOf)|a(sin|nchor|cos|t(tachEvent|ob|an(2)?)|pply|lert|b(s|ort))|r(ou(nd|teEvents)|e(size(By|To)|calc|turnValue|place|verse|l(oad|ease(Capture|Events)))|andom)|g(o|et(ResponseHeader|M(i(nutes|lliseconds)|onth)|Se(conds|lection)|Hours|Year|Time(zoneOffset)?|Da(y|te)|UTC(M(i(nutes|lliseconds)|onth)|Seconds|Hours|Da(y|te)|FullYear)|FullYear|A(ttention|llResponseHeaders)))|m(in|ove(B(y|elow)|To(Absolute)?|Above)|ergeAttributes|a(tch|rgins|x))|b(toa|ig|o(ld|rderWidths)|link|ack))\b(?=\()</string>
-			<key>name</key>
-			<string>support.function.js</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>\b(s(ub(stringData|mit)|plitText|e(t(NamedItem|Attribute(Node)?)|lect))|has(ChildNodes|Feature)|namedItem|c(l(ick|o(se|neNode))|reate(C(omment|DATASection|aption)|T(Head|extNode|Foot)|DocumentFragment|ProcessingInstruction|E(ntityReference|lement)|Attribute))|tabIndex|i(nsert(Row|Before|Cell|Data)|tem)|open|delete(Row|C(ell|aption)|T(Head|Foot)|Data)|focus|write(ln)?|a(dd|ppend(Child|Data))|re(set|place(Child|Data)|move(NamedItem|Child|Attribute(Node)?)?)|get(NamedItem|Element(sBy(Name|TagName)|ById)|Attribute(Node)?)|blur)\b(?=\()</string>
-			<key>name</key>
-			<string>support.function.dom.js</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>(?&lt;=\.)(s(ystemLanguage|cr(ipts|ollbars|een(X|Y|Top|Left))|t(yle(Sheets)?|atus(Text|bar)?)|ibling(Below|Above)|ource|uffixes|e(curity(Policy)?|l(ection|f)))|h(istory|ost(name)?|as(h|Focus))|y|X(MLDocument|SLDocument)|n(ext|ame(space(s|URI)|Prop))|M(IN_VALUE|AX_VALUE)|c(haracterSet|o(n(structor|trollers)|okieEnabled|lorDepth|mp(onents|lete))|urrent|puClass|l(i(p(boardData)?|entInformation)|osed|asses)|alle(e|r)|rypto)|t(o(olbar|p)|ext(Transform|Indent|Decoration|Align)|ags)|SQRT(1_2|2)|i(n(ner(Height|Width)|put)|ds|gnoreCase)|zIndex|o(scpu|n(readystatechange|Line)|uter(Height|Width)|p(sProfile|ener)|ffscreenBuffering)|NEGATIVE_INFINITY|d(i(splay|alog(Height|Top|Width|Left|Arguments)|rectories)|e(scription|fault(Status|Ch(ecked|arset)|View)))|u(ser(Profile|Language|Agent)|n(iqueID|defined)|pdateInterval)|_content|p(ixelDepth|ort|ersonalbar|kcs11|l(ugins|atform)|a(thname|dding(Right|Bottom|Top|Left)|rent(Window|Layer)?|ge(X(Offset)?|Y(Offset)?))|r(o(to(col|type)|duct(Sub)?|mpter)|e(vious|fix)))|e(n(coding|abledPlugin)|x(ternal|pando)|mbeds)|v(isibility|endor(Sub)?|Linkcolor)|URLUnencoded|P(I|OSITIVE_INFINITY)|f(ilename|o(nt(Size|Family|Weight)|rmName)|rame(s|Element)|gColor)|E|whiteSpace|l(i(stStyleType|n(eHeight|kColor))|o(ca(tion(bar)?|lName)|wsrc)|e(ngth|ft(Context)?)|a(st(M(odified|atch)|Index|Paren)|yer(s|X)|nguage))|a(pp(MinorVersion|Name|Co(deName|re)|Version)|vail(Height|Top|Width|Left)|ll|r(ity|guments)|Linkcolor|bove)|r(ight(Context)?|e(sponse(XML|Text)|adyState))|global|x|m(imeTypes|ultiline|enubar|argin(Right|Bottom|Top|Left))|L(N(10|2)|OG(10E|2E))|b(o(ttom|rder(Width|RightWidth|BottomWidth|Style|Color|TopWidth|LeftWidth))|ufferDepth|elow|ackground(Color|Image)))\b</string>
-			<key>name</key>
-			<string>support.constant.js</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>(?&lt;=\.)(s(hape|ystemId|c(heme|ope|rolling)|ta(ndby|rt)|ize|ummary|pecified|e(ctionRowIndex|lected(Index)?)|rc)|h(space|t(tpEquiv|mlFor)|e(ight|aders)|ref(lang)?)|n(o(Resize|tation(s|Name)|Shade|Href|de(Name|Type|Value)|Wrap)|extSibling|ame)|c(h(ildNodes|Off|ecked|arset)?|ite|o(ntent|o(kie|rds)|de(Base|Type)?|l(s|Span|or)|mpact)|ell(s|Spacing|Padding)|l(ear|assName)|aption)|t(ype|Bodies|itle|Head|ext|a(rget|gName)|Foot)|i(sMap|ndex|d|m(plementation|ages))|o(ptions|wnerDocument|bject)|d(i(sabled|r)|o(c(type|umentElement)|main)|e(clare|f(er|ault(Selected|Checked|Value)))|at(eTime|a))|useMap|p(ublicId|arentNode|r(o(file|mpt)|eviousSibling))|e(n(ctype|tities)|vent|lements)|v(space|ersion|alue(Type)?|Link|Align)|URL|f(irstChild|orm(s)?|ace|rame(Border)?)|width|l(ink(s)?|o(ngDesc|wSrc)|a(stChild|ng|bel))|a(nchors|c(ce(ssKey|pt(Charset)?)|tion)|ttributes|pplets|l(t|ign)|r(chive|eas)|xis|Link|bbr)|r(ow(s|Span|Index)|ules|e(v|ferrer|l|adOnly))|m(ultiple|e(thod|dia)|a(rgin(Height|Width)|xLength))|b(o(dy|rder)|ackground|gColor))\b</string>
-			<key>name</key>
-			<string>support.constant.dom.js</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>\b(ELEMENT_NODE|ATTRIBUTE_NODE|TEXT_NODE|CDATA_SECTION_NODE|ENTITY_REFERENCE_NODE|ENTITY_NODE|PROCESSING_INSTRUCTION_NODE|COMMENT_NODE|DOCUMENT_NODE|DOCUMENT_TYPE_NODE|DOCUMENT_FRAGMENT_NODE|NOTATION_NODE|INDEX_SIZE_ERR|DOMSTRING_SIZE_ERR|HIERARCHY_REQUEST_ERR|WRONG_DOCUMENT_ERR|INVALID_CHARACTER_ERR|NO_DATA_ALLOWED_ERR|NO_MODIFICATION_ALLOWED_ERR|NOT_FOUND_ERR|NOT_SUPPORTED_ERR|INUSE_ATTRIBUTE_ERR)\b</string>
-			<key>name</key>
-			<string>support.constant.dom.js</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>\bon(R(ow(s(inserted|delete)|e(nter|xit))|e(s(ize(start|end)?|et)|adystatechange))|Mouse(o(ut|ver)|down|up|move)|B(efore(cut|deactivate|u(nload|pdate)|p(aste|rint)|editfocus|activate)|lur)|S(croll|top|ubmit|elect(start|ionchange)?)|H(over|elp)|C(hange|ont(extmenu|rolselect)|ut|ellchange|l(ick|ose))|D(eactivate|ata(setc(hanged|omplete)|available)|r(op|ag(start|over|drop|en(ter|d)|leave)?)|blclick)|Unload|P(aste|ropertychange)|Error(update)?|Key(down|up|press)|Focus|Load|A(ctivate|fter(update|print)|bort))\b</string>
-			<key>name</key>
-			<string>support.function.event-handler.js</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>!|\$|%|&amp;|\*|\-\-|\-|\+\+|\+|~|===|==|=|!=|!==|&lt;=|&gt;=|&lt;&lt;=|&gt;&gt;=|&gt;&gt;&gt;=|&lt;&gt;|&lt;|&gt;|!|&amp;&amp;|\|\||\?\:|\*=|(?&lt;!\()/=|%=|\+=|\-=|&amp;=|\^=|\b(in|instanceof|new|delete|typeof|void)\b</string>
-			<key>name</key>
-			<string>keyword.operator.js</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>\b(Infinity|NaN|undefined)\b</string>
-			<key>name</key>
-			<string>constant.language.js</string>
-		</dict>
-		<dict>
-			<key>begin</key>
-			<string>(?&lt;=[=(:]|^|return|&amp;&amp;|\|\||!)\s*(/)(?![/*+{}?])</string>
-			<key>beginCaptures</key>
-			<dict>
-				<key>1</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.begin.js</string>
-				</dict>
-			</dict>
-			<key>end</key>
-			<string>(/)[igm]*</string>
-			<key>endCaptures</key>
-			<dict>
-				<key>1</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.end.js</string>
-				</dict>
-			</dict>
-			<key>name</key>
-			<string>string.regexp.js</string>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>match</key>
-					<string>\\.</string>
-					<key>name</key>
-					<string>constant.character.escape.js</string>
-				</dict>
-			</array>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>\;</string>
-			<key>name</key>
-			<string>punctuation.terminator.statement.js</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>,[ |\t]*</string>
-			<key>name</key>
-			<string>meta.delimiter.object.comma.js</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>\.</string>
-			<key>name</key>
-			<string>meta.delimiter.method.period.js</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>\{|\}</string>
-			<key>name</key>
-			<string>meta.brace.curly.js</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>\(|\)</string>
-			<key>name</key>
-			<string>meta.brace.round.js</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>\[|\]</string>
-			<key>name</key>
-			<string>meta.brace.square.js</string>
-		</dict>
-	</array>
-	<key>scopeName</key>
-	<string>source.js</string>
-	<key>uuid</key>
-	<string>93E017CC-6F27-11D9-90EB-000D93589AF6</string>
-</dict>
-</plist>
diff --git a/bundles/javascript.tmbundle/info.plist b/bundles/javascript.tmbundle/info.plist
deleted file mode 100644
index ea4a6ab44..000000000
--- a/bundles/javascript.tmbundle/info.plist
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>contactEmailRot13</key>
-	<string>boyvivbhf@fhogyrTenqvrag.pbz</string>
-	<key>contactName</key>
-	<string>Thomas Aylott</string>
-	<key>deleted</key>
-	<array>
-		<string>0FE55436-0C29-4545-A3BE-B858EF81E27B</string>
-	</array>
-	<key>description</key>
-	<string>Support for &lt;a href="http://developer.mozilla.org/en/docs/About_JavaScript"&gt;JavaScript&lt;/a&gt;.</string>
-	<key>mainMenu</key>
-	<dict>
-		<key>items</key>
-		<array>
-			<string>D2E6A1FE-2881-4754-B399-B65F61F29C2F</string>
-			<string>43F40EB6-5839-4BE8-99C8-4976D0534E5D</string>
-			<string>52090C49-D8B2-49A0-9597-80574354B3CD</string>
-			<string>------------------------------------</string>
-			<string>B4874A14-2491-465A-A349-61E4EBCF4700</string>
-			<string>------------------------------------</string>
-			<string>36EC03E9-EFF4-479A-AB90-8DFA16800642</string>
-			<string>20E61C43-B81F-4FB9-9362-BFFE668EB9C9</string>
-		</array>
-		<key>submenus</key>
-		<dict>
-			<key>43F40EB6-5839-4BE8-99C8-4976D0534E5D</key>
-			<dict>
-				<key>items</key>
-				<array>
-					<string>9E0E3BCC-7F20-4D6B-891D-A44D6EC56E31</string>
-				</array>
-				<key>name</key>
-				<string>DOM</string>
-			</dict>
-			<key>52090C49-D8B2-49A0-9597-80574354B3CD</key>
-			<dict>
-				<key>items</key>
-				<array>
-					<string>009A3E6C-FE3F-4A18-8759-2DC31F17BBE2</string>
-				</array>
-				<key>name</key>
-				<string>BOM</string>
-			</dict>
-			<key>66778C58-CE08-4F21-AD36-562149AEEE80</key>
-			<dict>
-				<key>items</key>
-				<array>
-					<string>4C6EDB43-3E2E-411B-A016-13C135C59833</string>
-					<string>F0E4FB6A-4878-48C6-A777-62438DF1E14F</string>
-					<string>------------------------------------</string>
-					<string>73951799-AC15-40A6-81DB-EC051AB4A033</string>
-					<string>1717B5AE-209B-4548-9155-9E88A7230C1C</string>
-					<string>------------------------------------</string>
-					<string>77065D69-742A-4FF0-9A41-AD211DFBE72F</string>
-					<string>7B9AEFCC-B450-416D-8527-430FE2A08568</string>
-				</array>
-				<key>name</key>
-				<string>Function</string>
-			</dict>
-			<key>7699AC1A-80AC-4120-A375-9371D1591F79</key>
-			<dict>
-				<key>items</key>
-				<array>
-					<string>F19F3732-39A7-48EC-A72B-A8F477A01795</string>
-					<string>31964029-9D71-4ADC-8213-DFE5C4E222B3</string>
-					<string>------------------------------------</string>
-					<string>011C4681-FBEC-4891-9326-3DECFCDED6D6</string>
-					<string>C207B7C3-5597-4873-8AAD-C46FB8842AF2</string>
-				</array>
-				<key>name</key>
-				<string>Control</string>
-			</dict>
-			<key>D2E6A1FE-2881-4754-B399-B65F61F29C2F</key>
-			<dict>
-				<key>items</key>
-				<array>
-					<string>7699AC1A-80AC-4120-A375-9371D1591F79</string>
-					<string>EC690F46-1906-4F55-9089-3C2929D5BB69</string>
-					<string>66778C58-CE08-4F21-AD36-562149AEEE80</string>
-				</array>
-				<key>name</key>
-				<string>Core</string>
-			</dict>
-			<key>EC690F46-1906-4F55-9089-3C2929D5BB69</key>
-			<dict>
-				<key>items</key>
-				<array>
-					<string>DC8B46FB-8ADA-45EA-8F36-94C807A0D302</string>
-					<string>AD506BEC-B33C-4168-A900-0A4D386A4B05</string>
-					<string>------------------------------------</string>
-					<string>2F96136B-0193-42F5-90FC-B6F456A3AD77</string>
-				</array>
-				<key>name</key>
-				<string>Language</string>
-			</dict>
-		</dict>
-	</dict>
-	<key>name</key>
-	<string>JavaScript</string>
-	<key>ordering</key>
-	<array>
-		<string>73951799-AC15-40A6-81DB-EC051AB4A033</string>
-		<string>1717B5AE-209B-4548-9155-9E88A7230C1C</string>
-		<string>B4874A14-2491-465A-A349-61E4EBCF4700</string>
-		<string>36EC03E9-EFF4-479A-AB90-8DFA16800642</string>
-		<string>20E61C43-B81F-4FB9-9362-BFFE668EB9C9</string>
-		<string>77065D69-742A-4FF0-9A41-AD211DFBE72F</string>
-		<string>F0E4FB6A-4878-48C6-A777-62438DF1E14F</string>
-		<string>2F96136B-0193-42F5-90FC-B6F456A3AD77</string>
-		<string>4C6EDB43-3E2E-411B-A016-13C135C59833</string>
-		<string>93E017CC-6F27-11D9-90EB-000D93589AF6</string>
-		<string>A67A8BD9-A951-406F-9175-018DD4B52FD1</string>
-		<string>BC062860-3346-4D3B-8421-C5543F83D11F</string>
-		<string>834BC727-6B31-4073-A161-4823227219EF</string>
-		<string>3CEA49B2-A5C5-405C-82E2-B8B668877C37</string>
-		<string>E6EB7CC8-04E8-43A9-93B2-BC9EF5BA862B</string>
-		<string>73557394-4F0F-4DD3-8029-EEE8201AC7F5</string>
-		<string>51841DDB-C2A4-461C-A8AB-6C124AD50EAE</string>
-		<string>F19F3732-39A7-48EC-A72B-A8F477A01795</string>
-		<string>31964029-9D71-4ADC-8213-DFE5C4E222B3</string>
-		<string>011C4681-FBEC-4891-9326-3DECFCDED6D6</string>
-		<string>C207B7C3-5597-4873-8AAD-C46FB8842AF2</string>
-		<string>AD506BEC-B33C-4168-A900-0A4D386A4B05</string>
-		<string>DC8B46FB-8ADA-45EA-8F36-94C807A0D302</string>
-		<string>009A3E6C-FE3F-4A18-8759-2DC31F17BBE2</string>
-		<string>7B9AEFCC-B450-416D-8527-430FE2A08568</string>
-		<string>9E0E3BCC-7F20-4D6B-891D-A44D6EC56E31</string>
-	</array>
-	<key>uuid</key>
-	<string>AAB4FD74-73F9-11D9-B89A-000D93589AF6</string>
-</dict>
-</plist>
diff --git a/bundles/less.tmbundle/Commands/Save to CSS.tmCommand b/bundles/less.tmbundle/Commands/Save to CSS.tmCommand
deleted file mode 100755
index aea5128d6..000000000
--- a/bundles/less.tmbundle/Commands/Save to CSS.tmCommand	
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>saveActiveFile</string>
-	<key>command</key>
-	<string>#!/usr/bin/env ruby
-file = STDIN.read[/lessc: ([^*]+\.less)/, 1] || ENV["TM_FILEPATH"]
-system("lessc --verbose \"#{file}\"")</string>
-	<key>input</key>
-	<string>document</string>
-	<key>keyEquivalent</key>
-	<string>@s</string>
-	<key>name</key>
-	<string>Save to CSS</string>
-	<key>output</key>
-	<string>showAsTooltip</string>
-	<key>scope</key>
-	<string>source.css.less</string>
-	<key>uuid</key>
-	<string>78788223-5E5E-434E-98BE-17BCDF600611</string>
-</dict>
-</plist>
diff --git a/bundles/less.tmbundle/README.md b/bundles/less.tmbundle/README.md
deleted file mode 100755
index 0b7bdc2f8..000000000
--- a/bundles/less.tmbundle/README.md
+++ /dev/null
@@ -1,47 +0,0 @@
-# LESS TextMate bundle
-
-Syntax highlighting for `.less` files. To learn more about [LESS][], see <http://lesscss.org/docs.html>.
-
-This bundle was forked from `appden/less.tmbundle` but has since been rewritten from scratch (the language syntax).
-
-[`sample.less`](http://github.com/rsms/less.tmbundle/blob/master/sample.less):
-
-<img src="http://github.com/rsms/less.tmbundle/raw/master/sample.png" width="600" height="465" />
-
-<small>Rendered in the ["Hunch Dark dimmed" theme](http://github.com/rsms/workenv/blob/master/textmate/Hunch-Dark-dimmed.tmTheme)</small>
-
-## Compiling to CSS (⌘B)
-
-Runs `lessc` on the current file, saving to the same file name with a .css extension (e.g. style.less => style.css). When there is `lessc: somefile.less` somewhere in the current file, that file is compiled instead.
-
-Compiling requires some version of `lessc` to be in your `PATH`.
-
-## Authors
-
-* Rasmus Andersson <http://hunch.se/> rsms@github
-* Scott Kyle <http://appden.com/> appden@github
-
-## License (MIT)
-
-Copyright (c) 2010 Scott Kyle and Rasmus Andersson
-
-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.
-
-
-[LESS]: http://lesscss.org
diff --git a/bundles/less.tmbundle/Syntaxes/LESS.tmLanguage b/bundles/less.tmbundle/Syntaxes/LESS.tmLanguage
deleted file mode 100755
index 593f1c3bf..000000000
--- a/bundles/less.tmbundle/Syntaxes/LESS.tmLanguage
+++ /dev/null
@@ -1,344 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>comment</key>
-	<string>LeSS</string>
-	<key>fileTypes</key>
-	<array>
-		<string>less</string>
-	</array>
-	<key>foldingStartMarker</key>
-	<string>/\*\*(?!\*)|\{\s*($|/\*(?!.*?\*/.*\S))</string>
-	<key>foldingStopMarker</key>
-	<string>(?&lt;!\*)\*\*/|^\s*\}</string>
-	<key>keyEquivalent</key>
-	<string>^~L</string>
-	<key>name</key>
-	<string>LESS</string>
-	<key>patterns</key>
-	<array>
-		<dict>
-			<key>match</key>
-			<string>\b(a|abbr|acronym|address|area|b|base|big|blockquote|body|br|button|caption|cite|code|col|colgroup|dd|del|dfn|div|dl|dt|em|fieldset|figure|form|frame|frameset|(h[1-6])|head|hr|html|i|iframe|img|input|ins|kbd|label|legend|li|link|map|meta|noframes|noscript|object|ol|optgroup|option|p|param|pre|q|samp|script|select|small|span|strike|strong|style|sub|sup|table|tbody|td|textarea|tfoot|th|thead|title|tr|tt|ul|var|header|section|footer|article|nav|aside|hgroup|time|mark)\b</string>
-			<key>name</key>
-			<string>keyword.control.html.elements</string>
-		</dict>
-		<dict>
-			<key>begin</key>
-			<string>"</string>
-			<key>end</key>
-			<string>"</string>
-			<key>name</key>
-			<string>string.quoted.double.css</string>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>match</key>
-					<string>\\.</string>
-					<key>name</key>
-					<string>constant.character.escaped.css</string>
-				</dict>
-			</array>
-		</dict>
-		<dict>
-			<key>begin</key>
-			<string>'</string>
-			<key>end</key>
-			<string>'</string>
-			<key>name</key>
-			<string>string.quoted.single.css</string>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>match</key>
-					<string>\\.</string>
-					<key>name</key>
-					<string>constant.character.escaped.css</string>
-				</dict>
-			</array>
-		</dict>
-		<dict>
-			<key>captures</key>
-			<dict>
-				<key>1</key>
-				<dict>
-					<key>name</key>
-					<string>entity.other.attribute-name.class.css</string>
-				</dict>
-			</dict>
-			<key>match</key>
-			<string>(\.[a-zA-Z0-9_-]+)[\s,{;]</string>
-		</dict>
-		<dict>
-			<key>begin</key>
-			<string>url\(</string>
-			<key>contentName</key>
-			<string>variable.parameter.url</string>
-			<key>end</key>
-			<string>\)</string>
-			<key>name</key>
-			<string>support.function.any-method.builtin.css</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>(#)([0-9a-fA-F]{3}|[0-9a-fA-F]{6})\b</string>
-			<key>name</key>
-			<string>constant.other.rgb-value.css</string>
-		</dict>
-		<dict>
-			<key>captures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>entity.other.attribute-name.id</string>
-				</dict>
-			</dict>
-			<key>match</key>
-			<string>#[a-zA-Z0-9_-]+</string>
-			<key>name</key>
-			<string>meta.selector.css</string>
-		</dict>
-		<dict>
-			<key>begin</key>
-			<string>/\*</string>
-			<key>end</key>
-			<string>\*/</string>
-			<key>name</key>
-			<string>comment.block.css</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>(-|\+)?\s*[0-9]+(\.[0-9]+)?</string>
-			<key>name</key>
-			<string>constant.numeric.css</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>(?&lt;=[\d])(px|pt|cm|mm|in|em|ex|pc)\b|%</string>
-			<key>name</key>
-			<string>keyword.unit.css</string>
-		</dict>
-		<dict>
-			<key>captures</key>
-			<dict>
-				<key>1</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.entity.css</string>
-				</dict>
-			</dict>
-			<key>match</key>
-			<string>(:+)\b(after|before|first-child|first-letter|first-line|selection)\b</string>
-			<key>name</key>
-			<string>entity.other.attribute-name.pseudo-element.css</string>
-		</dict>
-		<dict>
-			<key>captures</key>
-			<dict>
-				<key>1</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.entity.css</string>
-				</dict>
-			</dict>
-			<key>match</key>
-			<string>(:)\b(active|hover|link|visited|focus)\b</string>
-			<key>name</key>
-			<string>entity.other.attribute-name.pseudo-class.css</string>
-		</dict>
-		<dict>
-			<key>captures</key>
-			<dict>
-				<key>1</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.entity.css</string>
-				</dict>
-				<key>2</key>
-				<dict>
-					<key>name</key>
-					<string>entity.other.attribute-name.attribute.css</string>
-				</dict>
-				<key>3</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.separator.operator.css</string>
-				</dict>
-				<key>4</key>
-				<dict>
-					<key>name</key>
-					<string>string.unquoted.attribute-value.css</string>
-				</dict>
-				<key>5</key>
-				<dict>
-					<key>name</key>
-					<string>string.quoted.double.attribute-value.css</string>
-				</dict>
-				<key>6</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.begin.css</string>
-				</dict>
-				<key>7</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.end.css</string>
-				</dict>
-			</dict>
-			<key>match</key>
-			<string>(?i)(\[)\s*(-?[_a-z\\[[:^ascii:]]][_a-z0-9\-\\[[:^ascii:]]]*)(?:\s*([~|^$*]?=)\s*(?:(-?[_a-z\\[[:^ascii:]]][_a-z0-9\-\\[[:^ascii:]]]*)|((?&gt;(['"])(?:[^\\]|\\.)*?(\6)))))?\s*(\])</string>
-			<key>name</key>
-			<string>meta.attribute-selector.css</string>
-		</dict>
-		<dict>
-			<key>captures</key>
-			<dict>
-				<key>1</key>
-				<dict>
-					<key>name</key>
-					<string>keyword.control.at-rule.import.css</string>
-				</dict>
-				<key>2</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.keyword.css</string>
-				</dict>
-			</dict>
-			<key>match</key>
-			<string>^\s*((@)import\b)</string>
-			<key>name</key>
-			<string>meta.at-rule.import.css</string>
-		</dict>
-		<dict>
-			<key>captures</key>
-			<dict>
-				<key>1</key>
-				<dict>
-					<key>name</key>
-					<string>support.type.property-name.css.vendor</string>
-				</dict>
-			</dict>
-			<key>match</key>
-			<string>(-(?:webkit|moz|khtml|o|icab)-(?:background-size|border-radius|box-shadow|opacity|border-image))\s*:</string>
-		</dict>
-		<dict>
-			<key>captures</key>
-			<dict>
-				<key>1</key>
-				<dict>
-					<key>name</key>
-					<string>support.type.property-name.css</string>
-				</dict>
-			</dict>
-			<key>match</key>
-			<string>\b(azimuth|background-attachment|background-color|background-clip|background-image|background-position|background-repeat|background-size|background|behavior|border-bottom-color|border-bottom-style|border-bottom-width|border-bottom|border-collapse|border-color|border-left-color|border-left-style|border-left-width|border-left|border-right-color|border-right-style|border-right-width|border-right|border-spacing|border-style|border-top-color|border-top-style|border-top-width|border-top|border-width|border-radius|border|box-shadow|bottom|caption-side|clear|clip|color|content|counter-increment|counter-reset|cue-after|cue-before|cue|cursor|direction|display|elevation|empty-cells|float|font-family|font-size-adjust|font-size|font-stretch|font-style|font-variant|font-weight|font|height|left|letter-spacing|line-height|list-style-image|list-style-position|list-style-type|list-style|margin-bottom|margin-left|margin-right|margin-top|marker-offset|margin|marks|max-height|max-width|min-height|min-width|opacity|orphans|outline-color|outline-style|outline-width|outline|overflow(-[xy])?|padding-bottom|padding-left|padding-right|padding-top|padding|page-break-after|page-break-before|page-break-inside|page|pause-after|pause-before|pause|pitch-range|pitch|play-during|position|quotes|richness|right|size|speak-header|speak-numeral|speak-punctuation|speech-rate|speak|stress|table-layout|text-align|text-decoration|text-indent|text-shadow|text-transform|top|unicode-bidi|vertical-align|visibility|voice-family|volume|white-space|widows|width|word-spacing|z-index)\s*:</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>\b(absolute|all-scroll|always|auto|baseline|below|bidi-override|block|bold|bolder|both|bottom|break-all|break-word|capitalize|center|char|circle|col-resize|collapse|crosshair|dashed|decimal|default|disabled|disc|distribute-all-lines|distribute-letter|distribute-space|distribute|dotted|double|e-resize|ellipsis|fixed|groove|hand|help|hidden|horizontal|ideograph-alpha|ideograph-numeric|ideograph-parenthesis|ideograph-space|inactive|inherit|inline-block|inline|inset|inside|inter-ideograph|inter-word|italic|justify|keep-all|left|lighter|line-edge|line-through|line|linear|list-item|loose|lower-alpha|lower-roman|lowercase|lr-tb|ltr|medium|middle|move|n-resize|ne-resize|newspaper|no-drop|no-repeat|nw-resize|none|normal|not-allowed|nowrap|oblique|outset|outside|overline|pointer|progress|relative|repeat-x|repeat-y|repeat|right|ridge|row-resize|rtl|s-resize|scroll|se-resize|separate|small-caps|solid|square|static|strict|super|sw-resize|table-footer-group|table-header-group|tb-rl|text-bottom|text-top|text|thick|thin|top|transparent|underline|upper-alpha|upper-roman|uppercase|vertical-ideographic|vertical-text|visible|w-resize|wait|whitespace|padding-box)\b</string>
-			<key>name</key>
-			<string>support.constant.property-value.css</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>(\b(?i:arial|century|comic|courier|garamond|georgia|helvetica|impact|lucida|symbol|system|tahoma|times|trebuchet|utopia|verdana|webdings|sans-serif|serif|monospace)\b)</string>
-			<key>name</key>
-			<string>support.constant.font-name.css</string>
-		</dict>
-		<dict>
-			<key>comment</key>
-			<string>http://www.w3.org/TR/CSS21/syndata.html#value-def-color</string>
-			<key>match</key>
-			<string>\b(aqua|black|blue|fuchsia|gray|green|lime|maroon|navy|olive|orange|purple|red|silver|teal|white|yellow)\b</string>
-			<key>name</key>
-			<string>support.constant.color.w3c-standard-color-name.css</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>\b(saturate|desaturate|lighten|darken|grayscale)\b</string>
-			<key>name</key>
-			<string>support.function.any-method.builtin.less</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>\b(rgb|rgba|hsl|hsla|url)\b</string>
-			<key>name</key>
-			<string>support.function.any-method.builtin.css</string>
-		</dict>
-		<dict>
-			<key>captures</key>
-			<dict>
-				<key>1</key>
-				<dict>
-					<key>name</key>
-					<string>support.function.any-method.vendor.css</string>
-				</dict>
-			</dict>
-			<key>match</key>
-			<string>(-(?:webkit|moz|khtml|o|icab)-(?:gradient|linear-gradient))</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>\b(color-stop|from|to)\b</string>
-			<key>name</key>
-			<string>support.function.any-method.webkit.gradient.css</string>
-		</dict>
-		<dict>
-			<key>captures</key>
-			<dict>
-				<key>1</key>
-				<dict>
-					<key>name</key>
-					<string>support.function.less</string>
-				</dict>
-			</dict>
-			<key>match</key>
-			<string>(\.[a-zA-Z0-9_-]+)\s*(;|\()</string>
-		</dict>
-		<dict>
-			<key>begin</key>
-			<string>//</string>
-			<key>end</key>
-			<string>$\n?</string>
-			<key>name</key>
-			<string>comment.line.double-slash.less</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>@[a-zA-Z0-9_-][\w-]*</string>
-			<key>name</key>
-			<string>variable.other.less</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>\$|%|&amp;|\*|\-\-|\-|\+\+|\+|~|===|==|=|!=|!==|&lt;=|&gt;=|&lt;&lt;=|&gt;&gt;=|&gt;&gt;&gt;=|&lt;&gt;|&lt;|&gt;|!|&amp;&amp;|\|\||\?\:|\*=|(?&lt;!\()/=|%=|\+=|\-=|&amp;=|\^=|\/\b</string>
-			<key>name</key>
-			<string>keyword.operator.less</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>\{|\}</string>
-			<key>name</key>
-			<string>meta.brace.curly.js</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>\(|\)</string>
-			<key>name</key>
-			<string>meta.brace.round.js</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>\[|\]</string>
-			<key>name</key>
-			<string>meta.brace.square.js</string>
-		</dict>
-	</array>
-	<key>scopeName</key>
-	<string>source.css.less</string>
-	<key>uuid</key>
-	<string>9343D324-75A1-4733-A5C0-5D1D4B6182D0</string>
-</dict>
-</plist>
diff --git a/bundles/less.tmbundle/info.plist b/bundles/less.tmbundle/info.plist
deleted file mode 100755
index a99cd654d..000000000
--- a/bundles/less.tmbundle/info.plist
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>name</key>
-	<string>LESS</string>
-	<key>uuid</key>
-	<string>D1D51EE5-E89F-4B14-8AE4-FC364E540B47</string>
-	<key>ordering</key>
-	<array>
-		<string>78788223-5E5E-434E-98BE-17BCDF600611</string>
-		<string>9343D324-75A1-4733-A5C0-5D1D4B6182D0</string>
-	</array>
-</dict>
-</plist>
diff --git a/bundles/less.tmbundle/sample.less b/bundles/less.tmbundle/sample.less
deleted file mode 100755
index 790d9aeb8..000000000
--- a/bundles/less.tmbundle/sample.less
+++ /dev/null
@@ -1,44 +0,0 @@
-// Importing
-@import "_base.less"
-
-// Variables
-@nice-blue: #5B83AD;
-@light-blue: @nice-blue + #111;
-#header { color: @light-blue; }
-
-// Mixins
-.bordered(@color: #f04) {
-  border-top: dotted 1px @color;
-  border-bottom: solid 2px @color;
-}
-#menu a {
-  .bordered(#f00); color:#111;
-}
-
-// Nested
-#header {
-  h1 { font-size: 12px; }
-  .logo {
-    width: 300px;
-    :hover { text-decoration: none }
-  }
-}
-
-// Operations
-@base: 5%;
-@filler: @base * 2;
-@other: @base + @filler;
-td { 
-  background-color: @base-color + #111;
-  height: 100% / 2 + @filler;
-}
-
-/*
- Accessors
-*/
-.comment {
-  width: #defaults[@width];
-  color: .article['color']; 
-}
-
-
diff --git a/bundles/less.tmbundle/sample.png b/bundles/less.tmbundle/sample.png
deleted file mode 100755
index 5c72a3c5a3f5718d6380c9b46d74aef6c0034eb3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 74284
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
GLSTX`*8jW!

diff --git a/bundles/ruby-on-rails.tmbundle/.gitignore b/bundles/ruby-on-rails.tmbundle/.gitignore
deleted file mode 100644
index 8d7880ee6..000000000
--- a/bundles/ruby-on-rails.tmbundle/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-config/*.yml
-website/dist
-.DS_Store
diff --git a/bundles/ruby-on-rails.tmbundle/ABOUT b/bundles/ruby-on-rails.tmbundle/ABOUT
deleted file mode 100644
index 341ea0409..000000000
--- a/bundles/ruby-on-rails.tmbundle/ABOUT
+++ /dev/null
@@ -1,36 +0,0 @@
-== Rails Bundle 1.0 -> 2.0 SOON
-This bundle is (c) 2006 syncPEOPLE, LLC.
-As of version 1.0, it is distributed under the terms of the MIT License.
-
-http://syncpeople.com/ - We develop social interaction tools for online and real-world conferences and events.
-
-== Maintained by ==
-Dr Nic Williams
-drnicwilliams@gmail.com
-http://drnicwilliams.com
-
-== Created by ==
-Duane Johnson
-duane.johnson@gmail.com
-http://blog.inquirylabs.com/
-
-== Contributors (no doubt missing many) ==
-Sami Samhuri
-James Edward Grey II
-Michael Sheets
-Allan Odgaard
-Cliff Matthews
-Kent Siblev
-Stephen Touset
-Lawrence Pit
-Dean Strelau
-Daniel Kristensen
-Simon Jefford
-James Deville
-Stephen Bannasch
-Tom Morris
-David Lowenfels
-Sam Granieri
-Jacob Swanner
-Steve Ross
-Charles Roper
\ No newline at end of file
diff --git a/bundles/ruby-on-rails.tmbundle/CHANGELOG b/bundles/ruby-on-rails.tmbundle/CHANGELOG
deleted file mode 100644
index bc9c44101..000000000
--- a/bundles/ruby-on-rails.tmbundle/CHANGELOG
+++ /dev/null
@@ -1,109 +0,0 @@
-[Edge] Trundle to Rails 2.0 Bundle
-Ruby on Rails bundle maintenance has been taken over by Dr Nic Williams from its initial legendary creator Duane Johnson.
-See git branch two_point_ooh for initial drive to upgrade bundle for Rails 2.0 conventions (http://github.com/drnic/ruby-on-rails-tmbundle/tree/two_point_ooh)
-
-Added so far:
-  * Snippets/Commands for:
-    * Tests
-      * assert_select (ass)
-      * assert_difference/assert_no_difference (asd/asnd)
-      * GET+POST test method stubs (deftg+deftp)
-      * posts(:) + Alt+Esc allows you to select a posts.yml fixture
-    * Controllers
-      * respond_to (rest) and respond_to(html) (Shift+Cmd+H)
-      * 'Go To View' within a respond_to will use the format/wants type as the default
-      * REMOVED: render_component snippets
-      * loggers - pass a block instead of raw string to save time if
-        logging not used (e.g. production) [Stephen Touset]
-      * redirect_to for resource paths (rep, repp, renp, renpp)
-      * render :update (ru) [Simon Jefford]
-    * Views
-      * form_for and form_for(with errors) (ff,ffe)
-      * Various form_for helpers in a drop-down list, e.g. f.text_field (f.)
-      * Various form_for helpers with own tab completion, e.g. f.text_field (fftf)
-      * link_to for resource paths (lip, lipp, linp, linpp)
-      * <% end -%> (end)
-      * for-loop (for)
-      * link_to(@model.name, @model) (ltm)
-    * Layouts
-      * javascript_include_tag - jit
-      * stylesheet_link_tag - slt
-    * Models
-      * has_many :through (hmt)
-      * association snippets give better defaults (e.g. bt + hm)
-      * validates_format_of (vf,vfif) [Dean Strelau]
-      * validates_numericality_of (vn,vnif) [Tom Morris]
-      * before/after callbacks (prefix bef/aft + 1st letter of words) [Sam Granieri]
-    * Migrations
-      * Sexy Migrations now available as "t." snippets and regular snippets [Lawrence Pit]
-      * Migration classes have own textmate scope
-      * Add/Remove Columns - the 'down' statements are in reverse
-        order [Lawrence Pit, Daniel Kristensen]
-      * Added 'Redo Last Migration' [Simon Jefford]
-    * Functional Tests
-      * assert_redirect_to for resource paths (artp, artpp, artnp, artnpp)
-      * assert(assigns(:model)) (asg)
-    * Routes
-      * named routes, resources snippets (map, mapr, maprs)
-      * catch_all (mapca) [Sam Granieri]
-    * Active Support
-      * cattr_accessor/mattr_accessor (crw/mrw) [Jacob Swanner]
-      * returning (returning) [Jacob Swanner]
-  * Language/Syntax
-    * New keywords: rescue_from, alias_method_chain, alias_attribute, delegate, respond_to [David Lowenfels, Jacob Swanner]
-    * Added rb as a valid Rails file type [James Deville]
-  * Commands
-    * Auto-completion for Foxy Fixtures
-    * html.erb is the default for new templates (backwards compatibility
-      is being worked on too)
-    * 'Go To XXX' - available for wide range of permutations.
-      Fixtures -> Models; Models -> Controllers, etc
-    * haml is a valid file extension [Steve Ross]
-    * specify alternate default file extensions for: [Steve Ross]
-      * javascript - ENV['RAILS_JS_EXT']
-      * stylesheet - ENV['RAILS_CSS_EXT']
-      * view - ENV['RAILS_VIEW_EXT']
-    * 'Call Generate Script' now accesses all a project's generators
-  * Plugins
-    * Footnote
-      * footnote-edge uses .erb for templates [Stephen Bannasch]
-  * Internals
-    * Rakefile - test runner [Steve Ross]
-    * Added generator_test
-    * Removed unnecessary misc_test
-    * script/clean_bundle_file_names - rename non-os-agnostic file names [Charles Roper]
-  * Haml support [Lawrence Pit]
-
-For thoughts and patches, email drnicwilliams@gmail.com
-
-* BLACKHOLE OF CHANGELOG *
-...
-
-* END OF BLACKHOLE *
-2006-09-28 Added "Rake Migrate to Version", changed "rake migrate" to "rake db:migrate" to remove warning message.
-2006-02-22 Changed key bindings to TextMate conventions (http://macromates.com/textmate/manual/key_bindings#conventions)
-2006-02-22 Footnotes can be turned off for specific pages:
-            e.g. render :action => 'whatever', :footnotes => false [Duane]
-2006-02-22 intelligent go to file now asks for a view file name if it doesn't exist before going there [Duane]
-2006-02-22 Fixed that intelligent go to file was not recognizing view files other than rhtml [Duane]
-2006-02-21 Generated files open automatically [Duane, Sami Samhuri]
-2006-02-21 Generate migrations works (has to be chdir to rails_root to work) [Duane]
-2006-02-21 Fixed that the footnotes plugin was doubling the /controllers/ segment [Duane, Cliff Matthews]
-2006-02-21 Fixed that the footnotes plugin was rendering for rxml and rjs pages [Duane]
-
-0.9.1 Released
-
-2006-02-21 Fixed that the footnotes plugin was breaking on redirects [Duane]
-
-0.9 Released
-
-2006-02-20 Added Migration Snippets [Sami Samhuri]
-2006-02-20 Added Rails Engines plugin [Duane]
-2006-02-20 Added double quotes around call to CocoaDialog [Kent Siblev]
-2006-02-20 Intelligent Go To File will now go to the file nearest the caret for stylesheet and javascript tags with multiple files [Cliff Matthews]
-2006-02-20 Added plugin install script bound to ctrl-option-command-\ [Duane]
-2006-02-20 Added 'plugins' directory to Support, and included textmate_footnotes plugin. [Duane]
-2006-02-20 More intelligent argument regexps for javascripts and stylesheets [Cliff Matthews]
-2006-02-20 Generate command is now a background process [Duane]
-
-0.8 Released
\ No newline at end of file
diff --git a/bundles/ruby-on-rails.tmbundle/Capfile b/bundles/ruby-on-rails.tmbundle/Capfile
deleted file mode 100644
index c36d48d21..000000000
--- a/bundles/ruby-on-rails.tmbundle/Capfile
+++ /dev/null
@@ -1,3 +0,0 @@
-load 'deploy' if respond_to?(:namespace) # cap2 differentiator
-Dir['vendor/plugins/*/recipes/*.rb'].each { |plugin| load(plugin) }
-load 'config/deploy'
\ No newline at end of file
diff --git a/bundles/ruby-on-rails.tmbundle/Commands/Autocomplete Foreign Key Fixture Reference (habtm).tmCommand b/bundles/ruby-on-rails.tmbundle/Commands/Autocomplete Foreign Key Fixture Reference (habtm).tmCommand
deleted file mode 100644
index 91226b6d9..000000000
--- a/bundles/ruby-on-rails.tmbundle/Commands/Autocomplete Foreign Key Fixture Reference (habtm).tmCommand	
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>command</key>
-	<string>RUBYLIB="$TM_BUNDLE_SUPPORT/lib:$RUBYLIB"
-"${TM_RUBY:=ruby}" "${TM_BUNDLE_SUPPORT}/bin/fixture_auto_complete.rb" preserve</string>
-	<key>fallbackInput</key>
-	<string>line</string>
-	<key>input</key>
-	<string>selection</string>
-	<key>keyEquivalent</key>
-	<string>~$</string>
-	<key>name</key>
-	<string>Autocomplete Foreign Key Fixture Reference (habtm)</string>
-	<key>output</key>
-	<string>insertAsSnippet</string>
-	<key>scope</key>
-	<string>source.yaml</string>
-	<key>uuid</key>
-	<string>275C0B86-F735-49B6-8A22-218A8F4CC2E0</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Commands/Autocomplete Foreign Key Fixture Reference.tmCommand b/bundles/ruby-on-rails.tmbundle/Commands/Autocomplete Foreign Key Fixture Reference.tmCommand
deleted file mode 100644
index 885e3ae88..000000000
--- a/bundles/ruby-on-rails.tmbundle/Commands/Autocomplete Foreign Key Fixture Reference.tmCommand	
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>command</key>
-	<string>RUBYLIB="$TM_BUNDLE_SUPPORT/lib:$RUBYLIB"
-"${TM_RUBY:=ruby}" -- "${TM_BUNDLE_SUPPORT}/bin/fixture_auto_complete.rb" </string>
-	<key>fallbackInput</key>
-	<string>line</string>
-	<key>input</key>
-	<string>selection</string>
-	<key>keyEquivalent</key>
-	<string>~</string>
-	<key>name</key>
-	<string>Autocomplete Foreign Key Fixture Reference</string>
-	<key>output</key>
-	<string>insertAsSnippet</string>
-	<key>scope</key>
-	<string>source.yaml, meta.rails.unit_test, meta.rails.functional_test</string>
-	<key>uuid</key>
-	<string>0BCF0EE2-35EE-4959-A771-E74D55271D5A</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Commands/Clone Development DB to Test DB.tmCommand b/bundles/ruby-on-rails.tmbundle/Commands/Clone Development DB to Test DB.tmCommand
deleted file mode 100644
index 254a9a6f5..000000000
--- a/bundles/ruby-on-rails.tmbundle/Commands/Clone Development DB to Test DB.tmCommand	
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>command</key>
-	<string>RUBYLIB="$TM_BUNDLE_SUPPORT/lib:$RUBYLIB"
-"${TM_RUBY:=ruby}" -- "${TM_BUNDLE_SUPPORT}/bin/rake_helper.rb" db:test:clone
-</string>
-	<key>input</key>
-	<string>none</string>
-	<key>keyEquivalent</key>
-	<string>^|</string>
-	<key>name</key>
-	<string>Clone Development DB to Test DB</string>
-	<key>output</key>
-	<string>showAsHTML</string>
-	<key>scope</key>
-	<string>source.ruby.rails, source.yaml</string>
-	<key>uuid</key>
-	<string>6F2AB859-46E3-4FF5-A9A7-E9A813AB5DE1</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Commands/DB Schema Dump.plist b/bundles/ruby-on-rails.tmbundle/Commands/DB Schema Dump.plist
deleted file mode 100644
index b1f115057..000000000
--- a/bundles/ruby-on-rails.tmbundle/Commands/DB Schema Dump.plist	
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>command</key>
-	<string>RUBYLIB="$TM_BUNDLE_SUPPORT/lib:$RUBYLIB"
-"${TM_RUBY:=ruby}" -- "${TM_BUNDLE_SUPPORT}/bin/rake_helper.rb" db:schema:dump
-</string>
-	<key>input</key>
-	<string>none</string>
-	<key>keyEquivalent</key>
-	<string>^|</string>
-	<key>name</key>
-	<string>Dump DB to schema.rb</string>
-	<key>output</key>
-	<string>showAsHTML</string>
-	<key>scope</key>
-	<string>source.ruby.rails, source.yaml</string>
-	<key>uuid</key>
-	<string>310C901C-EF32-4E88-938A-804ABBF8C428</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Commands/DB Schema Import.plist b/bundles/ruby-on-rails.tmbundle/Commands/DB Schema Import.plist
deleted file mode 100644
index 5ef3bf494..000000000
--- a/bundles/ruby-on-rails.tmbundle/Commands/DB Schema Import.plist	
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>command</key>
-	<string>RUBYLIB="$TM_BUNDLE_SUPPORT/lib:$RUBYLIB"
-"${TM_RUBY:=ruby}" -- "${TM_BUNDLE_SUPPORT}/bin/rake_helper.rb" db:schema:load
-</string>
-	<key>input</key>
-	<string>none</string>
-	<key>keyEquivalent</key>
-	<string>^|</string>
-	<key>name</key>
-	<string>Load schema.rb to DB</string>
-	<key>output</key>
-	<string>showAsHTML</string>
-	<key>scope</key>
-	<string>source.ruby.rails, source.yaml</string>
-	<key>uuid</key>
-	<string>6DEF923E-2347-46EC-AFBE-183D08E63DC1</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Commands/Generate Quick Migration.tmCommand b/bundles/ruby-on-rails.tmbundle/Commands/Generate Quick Migration.tmCommand
deleted file mode 100644
index 82cd82399..000000000
--- a/bundles/ruby-on-rails.tmbundle/Commands/Generate Quick Migration.tmCommand	
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>command</key>
-	<string>RUBYLIB="$TM_BUNDLE_SUPPORT/lib:$RUBYLIB"
-"${TM_RUBY:=ruby}" -- "${TM_BUNDLE_SUPPORT}/bin/generate_quick_migration.rb"</string>
-	<key>fallbackInput</key>
-	<string>word</string>
-	<key>input</key>
-	<string>none</string>
-	<key>keyEquivalent</key>
-	<string>^M</string>
-	<key>name</key>
-	<string>Quick Migration</string>
-	<key>output</key>
-	<string>discard</string>
-	<key>scope</key>
-	<string>source.ruby.rails, source.yaml, text.html.ruby</string>
-	<key>uuid</key>
-	<string>D696FA2C-785A-4B73-A2F6-F750904DD7C2</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Commands/Generate.plist b/bundles/ruby-on-rails.tmbundle/Commands/Generate.plist
deleted file mode 100644
index da6b64f7b..000000000
--- a/bundles/ruby-on-rails.tmbundle/Commands/Generate.plist
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>command</key>
-	<string>RUBYLIB="$TM_BUNDLE_SUPPORT/lib:$RUBYLIB"
-"${TM_RUBY:=ruby}" -- "${TM_BUNDLE_SUPPORT}/bin/generate.rb" &amp;&gt;/dev/null &amp;
-</string>
-	<key>input</key>
-	<string>none</string>
-	<key>keyEquivalent</key>
-	<string>^|</string>
-	<key>name</key>
-	<string>Call Generate Script</string>
-	<key>output</key>
-	<string>discard</string>
-	<key>scope</key>
-	<string>source.ruby.rails, source.yaml</string>
-	<key>uuid</key>
-	<string>4904EDC7-5ED3-4132-AAB2-C2AD87C97EFE</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Commands/Go To Alternate File.plist b/bundles/ruby-on-rails.tmbundle/Commands/Go To Alternate File.plist
deleted file mode 100644
index 4752c78e5..000000000
--- a/bundles/ruby-on-rails.tmbundle/Commands/Go To Alternate File.plist	
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>command</key>
-	<string>RUBYLIB="$TM_BUNDLE_SUPPORT/lib:$RUBYLIB"
-"${TM_RUBY:=ruby}" -- "${TM_BUNDLE_SUPPORT}/bin/go_to_alternate_file.rb" controller</string>
-	<key>input</key>
-	<string>none</string>
-	<key>keyEquivalent</key>
-	<string>~$@</string>
-	<key>name</key>
-	<string>Go to Controller</string>
-	<key>output</key>
-	<string>showAsTooltip</string>
-	<key>scope</key>
-	<string>text.html.ruby, source.ruby.rails.embedded.html, meta.rails.helper, meta.rails.functional_test, source.js, source.css, source.yaml, meta.rails.model, meta.rails.unit_test, text.haml</string>
-	<key>uuid</key>
-	<string>9453F0B3-B946-445F-BDB0-B01DE70732FC</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Commands/Go To File on This Line.plist b/bundles/ruby-on-rails.tmbundle/Commands/Go To File on This Line.plist
deleted file mode 100644
index 1d1cdf0fb..000000000
--- a/bundles/ruby-on-rails.tmbundle/Commands/Go To File on This Line.plist	
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>command</key>
-	<string>RUBYLIB="$TM_BUNDLE_SUPPORT/lib:$RUBYLIB"
-"${TM_RUBY:=ruby}" -- "${TM_BUNDLE_SUPPORT}/bin/go_to_file_on_current_line.rb"</string>
-	<key>input</key>
-	<string>none</string>
-	<key>keyEquivalent</key>
-	<string>~@</string>
-	<key>name</key>
-	<string>File on Current Line</string>
-	<key>output</key>
-	<string>showAsTooltip</string>
-	<key>scope</key>
-	<string>source.ruby.rails, text.html.ruby, source.ruby.rails.embedded.html, text.haml</string>
-	<key>uuid</key>
-	<string>09BB96F2-75FD-48A7-8314-B5B56B09B477</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Commands/Go To File.plist b/bundles/ruby-on-rails.tmbundle/Commands/Go To File.plist
deleted file mode 100644
index dbbe3f4b8..000000000
--- a/bundles/ruby-on-rails.tmbundle/Commands/Go To File.plist	
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>saveActiveFile</string>
-	<key>command</key>
-	<string>RUBYLIB="$TM_BUNDLE_SUPPORT/lib:$RUBYLIB"
-"${TM_RUBY:=ruby}" -- "${TM_BUNDLE_SUPPORT}/bin/go_to_alternate_file.rb"</string>
-	<key>input</key>
-	<string>none</string>
-	<key>keyEquivalent</key>
-	<string>~@</string>
-	<key>name</key>
-	<string>Alternate File</string>
-	<key>output</key>
-	<string>showAsTooltip</string>
-	<key>scope</key>
-	<string>source.ruby.rails, text.html.ruby, source.ruby.rails.embedded.html, source.yaml, text.haml, source.css, source.js, source.sass</string>
-	<key>uuid</key>
-	<string>0CCC8443-40F3-4BAB-9440-D737562B5F45</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Commands/Go To Functional Test.plist b/bundles/ruby-on-rails.tmbundle/Commands/Go To Functional Test.plist
deleted file mode 100644
index 70a3ad76f..000000000
--- a/bundles/ruby-on-rails.tmbundle/Commands/Go To Functional Test.plist	
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>command</key>
-	<string>RUBYLIB="$TM_BUNDLE_SUPPORT/lib:$RUBYLIB"
-"${TM_RUBY:=ruby}" -- "${TM_BUNDLE_SUPPORT}/bin/go_to_alternate_file.rb" functional_test</string>
-	<key>input</key>
-	<string>none</string>
-	<key>keyEquivalent</key>
-	<string>~$@</string>
-	<key>name</key>
-	<string>Go to Functional Test</string>
-	<key>output</key>
-	<string>showAsTooltip</string>
-	<key>scope</key>
-	<string>meta.rails.controller, meta.rails.helper, meta.rails.model, source.yaml, meta.rails.unit_test</string>
-	<key>uuid</key>
-	<string>DFE393BE-0764-49FE-B464-6350A50921E6</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Commands/Go To Helper.plist b/bundles/ruby-on-rails.tmbundle/Commands/Go To Helper.plist
deleted file mode 100644
index 8f9de159a..000000000
--- a/bundles/ruby-on-rails.tmbundle/Commands/Go To Helper.plist	
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>command</key>
-	<string>RUBYLIB="$TM_BUNDLE_SUPPORT/lib:$RUBYLIB"
-"${TM_RUBY:=ruby}" -- "${TM_BUNDLE_SUPPORT}/bin/go_to_alternate_file.rb" helper</string>
-	<key>input</key>
-	<string>none</string>
-	<key>keyEquivalent</key>
-	<string>~$@</string>
-	<key>name</key>
-	<string>Go to Helper</string>
-	<key>output</key>
-	<string>showAsTooltip</string>
-	<key>scope</key>
-	<string>text.html.ruby, source.ruby.rails.embedded.html, meta.rails.controller, meta.rails.model, meta.rails.unit_test, meta.rails.functional_test, text.haml</string>
-	<key>uuid</key>
-	<string>51C9C27A-D931-49F9-B6D8-C0E7ABEC992D</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Commands/Go To Javascript.plist b/bundles/ruby-on-rails.tmbundle/Commands/Go To Javascript.plist
deleted file mode 100644
index 11e28b633..000000000
--- a/bundles/ruby-on-rails.tmbundle/Commands/Go To Javascript.plist	
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>command</key>
-	<string>RUBYLIB="$TM_BUNDLE_SUPPORT/lib:$RUBYLIB"
-"${TM_RUBY:=ruby}" -- "${TM_BUNDLE_SUPPORT}/bin/go_to_alternate_file.rb" javascript</string>
-	<key>input</key>
-	<string>none</string>
-	<key>keyEquivalent</key>
-	<string>~$@</string>
-	<key>name</key>
-	<string>Go to Javascript</string>
-	<key>output</key>
-	<string>showAsTooltip</string>
-	<key>scope</key>
-	<string>text.html.ruby, source.ruby.rails.embedded.html, meta.rails.controller, meta.rails.helper, text.haml</string>
-	<key>uuid</key>
-	<string>B078346F-61D8-4E75-9427-80720FBC67F7</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Commands/Go To Model.tmCommand b/bundles/ruby-on-rails.tmbundle/Commands/Go To Model.tmCommand
deleted file mode 100644
index 14cc7a96d..000000000
--- a/bundles/ruby-on-rails.tmbundle/Commands/Go To Model.tmCommand	
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>command</key>
-	<string>RUBYLIB="$TM_BUNDLE_SUPPORT/lib:$RUBYLIB"
-"${TM_RUBY:=ruby}" -- "${TM_BUNDLE_SUPPORT}/bin/go_to_alternate_file.rb" model</string>
-	<key>input</key>
-	<string>none</string>
-	<key>keyEquivalent</key>
-	<string>~$@</string>
-	<key>name</key>
-	<string>Go to Model</string>
-	<key>output</key>
-	<string>showAsTooltip</string>
-	<key>scope</key>
-	<string>text.html.ruby, source.ruby.rails.embedded.html, meta.rails.helper, meta.rails.unit_test, source.js, source.css, source.yaml, meta.rails.controller, meta.rails.functional_test, text.haml</string>
-	<key>uuid</key>
-	<string>C7151BF3-7068-4344-9B09-86F3BF4A9C63</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Commands/Go To Stylesheet.plist b/bundles/ruby-on-rails.tmbundle/Commands/Go To Stylesheet.plist
deleted file mode 100644
index c635608b0..000000000
--- a/bundles/ruby-on-rails.tmbundle/Commands/Go To Stylesheet.plist	
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>command</key>
-	<string>RUBYLIB="$TM_BUNDLE_SUPPORT/lib:$RUBYLIB"
-"${TM_RUBY:=ruby}" -- "${TM_BUNDLE_SUPPORT}/bin/go_to_alternate_file.rb" stylesheet</string>
-	<key>input</key>
-	<string>none</string>
-	<key>keyEquivalent</key>
-	<string>~$@</string>
-	<key>name</key>
-	<string>Go to Stylesheet</string>
-	<key>output</key>
-	<string>showAsTooltip</string>
-	<key>scope</key>
-	<string>text.html.ruby, source.ruby.rails.embedded.html, meta.rails.controller, meta.rails.helper, text.haml</string>
-	<key>uuid</key>
-	<string>B207BBD4-D6AA-41E9-9530-27210F2D7B66</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Commands/Go To Unit Test.plist b/bundles/ruby-on-rails.tmbundle/Commands/Go To Unit Test.plist
deleted file mode 100644
index 55cd62f2f..000000000
--- a/bundles/ruby-on-rails.tmbundle/Commands/Go To Unit Test.plist	
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>command</key>
-	<string>RUBYLIB="$TM_BUNDLE_SUPPORT/lib:$RUBYLIB"
-"${TM_RUBY:=ruby}" -- "${TM_BUNDLE_SUPPORT}/bin/go_to_alternate_file.rb" unit_test</string>
-	<key>input</key>
-	<string>none</string>
-	<key>keyEquivalent</key>
-	<string>~$@</string>
-	<key>name</key>
-	<string>Go to Unit Test</string>
-	<key>output</key>
-	<string>showAsTooltip</string>
-	<key>scope</key>
-	<string>meta.rails.controller, meta.rails.helper, meta.rails.model, meta.rails.functional_test, source.yaml</string>
-	<key>uuid</key>
-	<string>BDBB15A4-2824-4BEC-93A5-7475F9C46A39</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Commands/Go To View.plist b/bundles/ruby-on-rails.tmbundle/Commands/Go To View.plist
deleted file mode 100644
index 76ddc6f9e..000000000
--- a/bundles/ruby-on-rails.tmbundle/Commands/Go To View.plist	
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>command</key>
-	<string>RUBYLIB="$TM_BUNDLE_SUPPORT/lib:$RUBYLIB"
-"${TM_RUBY:=ruby}" -- "${TM_BUNDLE_SUPPORT}/bin/go_to_alternate_file.rb" view</string>
-	<key>input</key>
-	<string>none</string>
-	<key>keyEquivalent</key>
-	<string>~$@</string>
-	<key>name</key>
-	<string>Go to View</string>
-	<key>output</key>
-	<string>showAsTooltip</string>
-	<key>scope</key>
-	<string>meta.rails.controller, meta.rails.mailer, source.js, source.css</string>
-	<key>uuid</key>
-	<string>EE862691-A624-4797-90CF-EDD39EFB2D8E</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Commands/Go to Fixture.tmCommand b/bundles/ruby-on-rails.tmbundle/Commands/Go to Fixture.tmCommand
deleted file mode 100644
index f7235f48e..000000000
--- a/bundles/ruby-on-rails.tmbundle/Commands/Go to Fixture.tmCommand	
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>command</key>
-	<string>RUBYLIB="$TM_BUNDLE_SUPPORT/lib:$RUBYLIB"
-"${TM_RUBY:=ruby}" -- "${TM_BUNDLE_SUPPORT}/bin/go_to_alternate_file.rb" fixture</string>
-	<key>input</key>
-	<string>none</string>
-	<key>keyEquivalent</key>
-	<string>~$@</string>
-	<key>name</key>
-	<string>Go to Fixture</string>
-	<key>output</key>
-	<string>showAsTooltip</string>
-	<key>scope</key>
-	<string>meta.rails.controller, meta.rails.helper, meta.rails.model, meta.rails.unit_test, meta.rails.functional_test</string>
-	<key>uuid</key>
-	<string>638D94A4-BDFC-4FE9-8909-9934F3FD2899</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Commands/Install Bundled Plugin.plist b/bundles/ruby-on-rails.tmbundle/Commands/Install Bundled Plugin.plist
deleted file mode 100644
index a0dd47da2..000000000
--- a/bundles/ruby-on-rails.tmbundle/Commands/Install Bundled Plugin.plist	
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>command</key>
-	<string>RUBYLIB="$TM_BUNDLE_SUPPORT/lib:$RUBYLIB"
-"${TM_RUBY:=ruby}" -- "${TM_BUNDLE_SUPPORT}/bin/list_plugins.rb"</string>
-	<key>input</key>
-	<string>none</string>
-	<key>keyEquivalent</key>
-	<string>^|</string>
-	<key>name</key>
-	<string>Install Plugin</string>
-	<key>output</key>
-	<string>showAsHTML</string>
-	<key>scope</key>
-	<string>source.ruby.rails, source.yaml</string>
-	<key>uuid</key>
-	<string>46ECE243-0448-4A64-A223-27CC21E7704D</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Commands/Load Fixtures (Test DB).tmCommand b/bundles/ruby-on-rails.tmbundle/Commands/Load Fixtures (Test DB).tmCommand
deleted file mode 100644
index ad2f54449..000000000
--- a/bundles/ruby-on-rails.tmbundle/Commands/Load Fixtures (Test DB).tmCommand	
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>command</key>
-	<string>RUBYLIB="$TM_BUNDLE_SUPPORT/lib:$RUBYLIB"
-"${TM_RUBY:=ruby}" -- "${TM_BUNDLE_SUPPORT}/bin/rake_helper.rb" db:fixtures:load -v RAILS_ENV -a test
-</string>
-	<key>input</key>
-	<string>none</string>
-	<key>keyEquivalent</key>
-	<string>^|</string>
-	<key>name</key>
-	<string>Load Fixtures (Test DB)</string>
-	<key>output</key>
-	<string>showAsHTML</string>
-	<key>scope</key>
-	<string>source.ruby.rails, source.yaml</string>
-	<key>uuid</key>
-	<string>F758BFD1-00CA-4742-BE71-032580080F5C</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Commands/Load Fixtures.tmCommand b/bundles/ruby-on-rails.tmbundle/Commands/Load Fixtures.tmCommand
deleted file mode 100644
index 38e248146..000000000
--- a/bundles/ruby-on-rails.tmbundle/Commands/Load Fixtures.tmCommand	
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>command</key>
-	<string>RUBYLIB="$TM_BUNDLE_SUPPORT/lib:$RUBYLIB"
-"${TM_RUBY:=ruby}" -- "${TM_BUNDLE_SUPPORT}/bin/rake_helper.rb" db:fixtures:load
-</string>
-	<key>input</key>
-	<string>none</string>
-	<key>keyEquivalent</key>
-	<string>^|</string>
-	<key>name</key>
-	<string>Load Fixtures (Development DB)</string>
-	<key>output</key>
-	<string>showAsHTML</string>
-	<key>scope</key>
-	<string>source.ruby.rails, source.yaml</string>
-	<key>uuid</key>
-	<string>5EEA0C71-B34B-4408-953B-F47AAD343CCC</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Commands/Make Selection in to Partial.plist b/bundles/ruby-on-rails.tmbundle/Commands/Make Selection in to Partial.plist
deleted file mode 100644
index 0d9d2230b..000000000
--- a/bundles/ruby-on-rails.tmbundle/Commands/Make Selection in to Partial.plist	
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>saveModifiedFiles</string>
-	<key>command</key>
-	<string>RUBYLIB="$TM_BUNDLE_SUPPORT/lib:$RUBYLIB"
-"${TM_RUBY:=ruby}" -- "${TM_BUNDLE_SUPPORT}/bin/create_partial_from_selection.rb"
-</string>
-	<key>fallbackInput</key>
-	<string>line</string>
-	<key>input</key>
-	<string>selection</string>
-	<key>keyEquivalent</key>
-	<string>^H</string>
-	<key>name</key>
-	<string>Create Partial From Selection</string>
-	<key>output</key>
-	<string>replaceSelectedText</string>
-	<key>scope</key>
-	<string>source.ruby.rails, text.html.ruby, text.haml</string>
-	<key>uuid</key>
-	<string>1DD8A214-1C97-45BA-ADEE-8F888DDE8570</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Commands/Migrate to Previous Version.tmCommand b/bundles/ruby-on-rails.tmbundle/Commands/Migrate to Previous Version.tmCommand
deleted file mode 100644
index eebc5b41a..000000000
--- a/bundles/ruby-on-rails.tmbundle/Commands/Migrate to Previous Version.tmCommand	
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>command</key>
-	<string>RUBYLIB="$TM_BUNDLE_SUPPORT/lib:$RUBYLIB"
-
-# Find the previous version number from the schema.rb file
-export PREVIOUS=`grep 'Schema\.define' "$TM_PROJECT_DIRECTORY/db/schema.rb" | ruby -e 'print $stdin.read.scan(/\d+/).first.to_i - 1'`
-
-# Migrate database to the previous version
-"${TM_RUBY:=ruby}" -- "${TM_BUNDLE_SUPPORT}/bin/rake_helper.rb" db:migrate -v VERSION -a $PREVIOUS
-</string>
-	<key>input</key>
-	<string>none</string>
-	<key>keyEquivalent</key>
-	<string>^|</string>
-	<key>name</key>
-	<string>Migrate to Previous Version</string>
-	<key>output</key>
-	<string>showAsHTML</string>
-	<key>scope</key>
-	<string>source.ruby.rails, source.yaml</string>
-	<key>uuid</key>
-	<string>9A1AE6BA-8350-4AB7-B5BD-969A7E64CF29</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Commands/Rake Migrate to Version.tmCommand b/bundles/ruby-on-rails.tmbundle/Commands/Rake Migrate to Version.tmCommand
deleted file mode 100644
index 523171498..000000000
--- a/bundles/ruby-on-rails.tmbundle/Commands/Rake Migrate to Version.tmCommand	
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>command</key>
-	<string>RUBYLIB="$TM_BUNDLE_SUPPORT/lib:$RUBYLIB"
-
-# Find the current version number from the schema.rb file
-export CURRENT=`grep 'Schema\.define' "$TM_PROJECT_DIRECTORY/db/schema.rb" | ruby -e 'print $stdin.read.scan(/\d+/).first'`
-
-"${TM_RUBY:=ruby}" -- "${TM_BUNDLE_SUPPORT}/bin/rake_helper.rb" db:migrate -q "Migrate to which version? (Current version: $CURRENT)" -v VERSION
-</string>
-	<key>input</key>
-	<string>none</string>
-	<key>keyEquivalent</key>
-	<string>^|</string>
-	<key>name</key>
-	<string>Migrate to Version ...</string>
-	<key>output</key>
-	<string>showAsHTML</string>
-	<key>scope</key>
-	<string>source.ruby.rails, source.yaml</string>
-	<key>uuid</key>
-	<string>07C696F8-79F5-4E0B-9EE9-03B693A54ABB</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Commands/Rake Migrate.plist b/bundles/ruby-on-rails.tmbundle/Commands/Rake Migrate.plist
deleted file mode 100644
index dda96db82..000000000
--- a/bundles/ruby-on-rails.tmbundle/Commands/Rake Migrate.plist	
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>command</key>
-	<string>RUBYLIB="$TM_BUNDLE_SUPPORT/lib:$RUBYLIB"
-"${TM_RUBY:=ruby}" -- "${TM_BUNDLE_SUPPORT}/bin/rake_helper.rb" db:migrate
-</string>
-	<key>input</key>
-	<string>none</string>
-	<key>keyEquivalent</key>
-	<string>^|</string>
-	<key>name</key>
-	<string>Migrate to Current</string>
-	<key>output</key>
-	<string>showAsHTML</string>
-	<key>scope</key>
-	<string>source.ruby.rails, source.yaml</string>
-	<key>uuid</key>
-	<string>985F56D4-82ED-4C45-8250-2ECCFC71957E</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Commands/Redo Last Migration.tmCommand b/bundles/ruby-on-rails.tmbundle/Commands/Redo Last Migration.tmCommand
deleted file mode 100644
index 04ea67a7b..000000000
--- a/bundles/ruby-on-rails.tmbundle/Commands/Redo Last Migration.tmCommand	
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>command</key>
-	<string>RUBYLIB="$TM_BUNDLE_SUPPORT/lib:$RUBYLIB"
-"${TM_RUBY:=ruby}" -- "${TM_BUNDLE_SUPPORT}/bin/rake_helper.rb" db:migrate:redo
-</string>
-	<key>input</key>
-	<string>none</string>
-	<key>keyEquivalent</key>
-	<string>^|</string>
-	<key>name</key>
-	<string>Redo Last Migration</string>
-	<key>output</key>
-	<string>showAsHTML</string>
-	<key>scope</key>
-	<string>source.ruby.rails, source.yaml</string>
-	<key>uuid</key>
-	<string>CFDA9F62-D071-4E0F-AD10-66AE0729FFCF</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Commands/Show DB Schema.tmCommand b/bundles/ruby-on-rails.tmbundle/Commands/Show DB Schema.tmCommand
deleted file mode 100644
index 345b00a9f..000000000
--- a/bundles/ruby-on-rails.tmbundle/Commands/Show DB Schema.tmCommand	
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>command</key>
-	<string>RUBYLIB="$TM_BUNDLE_SUPPORT/lib:$RUBYLIB"
-"${TM_RUBY:=ruby}" -- "${TM_BUNDLE_SUPPORT}/bin/show_schema.rb"
-</string>
-	<key>input</key>
-	<string>none</string>
-	<key>keyEquivalent</key>
-	<string>^@S</string>
-	<key>name</key>
-	<string>Show DB Schema for Current Class</string>
-	<key>output</key>
-	<string>showAsTooltip</string>
-	<key>scope</key>
-	<string>source.ruby.rails</string>
-	<key>uuid</key>
-	<string>1970AE74-3949-40B3-B263-727AA3FF167A</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Commands/Test All.tmCommand b/bundles/ruby-on-rails.tmbundle/Commands/Test All.tmCommand
deleted file mode 100644
index cf7084c3c..000000000
--- a/bundles/ruby-on-rails.tmbundle/Commands/Test All.tmCommand	
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>command</key>
-	<string>RUBYLIB="$TM_BUNDLE_SUPPORT/lib:$RUBYLIB"
-"${TM_RUBY:=ruby}" -- "${TM_BUNDLE_SUPPORT}/bin/rake_helper.rb" test</string>
-	<key>input</key>
-	<string>none</string>
-	<key>keyEquivalent</key>
-	<string>^\</string>
-	<key>name</key>
-	<string>Test All</string>
-	<key>output</key>
-	<string>showAsHTML</string>
-	<key>scope</key>
-	<string>source.ruby.rails, source.yaml</string>
-	<key>uuid</key>
-	<string>DC549A45-D9B0-11DC-94E9-00112475D960</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Commands/Test Functionals.tmCommand b/bundles/ruby-on-rails.tmbundle/Commands/Test Functionals.tmCommand
deleted file mode 100644
index 19bbec320..000000000
--- a/bundles/ruby-on-rails.tmbundle/Commands/Test Functionals.tmCommand	
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>command</key>
-	<string>RUBYLIB="$TM_BUNDLE_SUPPORT/lib:$RUBYLIB"
-"${TM_RUBY:=ruby}" -- "${TM_BUNDLE_SUPPORT}/bin/rake_helper.rb" test:functionals</string>
-	<key>input</key>
-	<string>none</string>
-	<key>keyEquivalent</key>
-	<string>^\</string>
-	<key>name</key>
-	<string>Test Functionals</string>
-	<key>output</key>
-	<string>showAsHTML</string>
-	<key>scope</key>
-	<string>source.ruby.rails, source.yaml</string>
-	<key>uuid</key>
-	<string>F4EA552D-D9B0-11DC-94E9-00112475D960</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Commands/Test Integration.tmCommand b/bundles/ruby-on-rails.tmbundle/Commands/Test Integration.tmCommand
deleted file mode 100644
index 64143d0e7..000000000
--- a/bundles/ruby-on-rails.tmbundle/Commands/Test Integration.tmCommand	
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>command</key>
-	<string>RUBYLIB="$TM_BUNDLE_SUPPORT/lib:$RUBYLIB"
-"${TM_RUBY:=ruby}" -- "${TM_BUNDLE_SUPPORT}/bin/rake_helper.rb" test:integration</string>
-	<key>input</key>
-	<string>none</string>
-	<key>keyEquivalent</key>
-	<string>^\</string>
-	<key>name</key>
-	<string>Test Integration</string>
-	<key>output</key>
-	<string>showAsHTML</string>
-	<key>scope</key>
-	<string>source.ruby.rails, source.yaml</string>
-	<key>uuid</key>
-	<string>04A30A4D-D9B1-11DC-94E9-00112475D960</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Commands/Test Plugins.tmCommand b/bundles/ruby-on-rails.tmbundle/Commands/Test Plugins.tmCommand
deleted file mode 100644
index 9cbe5f2aa..000000000
--- a/bundles/ruby-on-rails.tmbundle/Commands/Test Plugins.tmCommand	
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>command</key>
-	<string>RUBYLIB="$TM_BUNDLE_SUPPORT/lib:$RUBYLIB"
-"${TM_RUBY:=ruby}" -- "${TM_BUNDLE_SUPPORT}/bin/rake_helper.rb" test:plugins</string>
-	<key>input</key>
-	<string>none</string>
-	<key>keyEquivalent</key>
-	<string>^\</string>
-	<key>name</key>
-	<string>Test Plugins</string>
-	<key>output</key>
-	<string>showAsHTML</string>
-	<key>scope</key>
-	<string>source.ruby.rails, source.yaml</string>
-	<key>uuid</key>
-	<string>0D966168-D9B1-11DC-94E9-00112475D960</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Commands/Test Recent.tmCommand b/bundles/ruby-on-rails.tmbundle/Commands/Test Recent.tmCommand
deleted file mode 100644
index cb0e0e5f3..000000000
--- a/bundles/ruby-on-rails.tmbundle/Commands/Test Recent.tmCommand	
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>command</key>
-	<string>RUBYLIB="$TM_BUNDLE_SUPPORT/lib:$RUBYLIB"
-"${TM_RUBY:=ruby}" -- "${TM_BUNDLE_SUPPORT}/bin/rake_helper.rb" test:recent</string>
-	<key>input</key>
-	<string>none</string>
-	<key>keyEquivalent</key>
-	<string>^\</string>
-	<key>name</key>
-	<string>Test Recent</string>
-	<key>output</key>
-	<string>showAsHTML</string>
-	<key>scope</key>
-	<string>source.ruby.rails, source.yaml</string>
-	<key>uuid</key>
-	<string>190401C2-D9B1-11DC-94E9-00112475D960</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Commands/Test Uncommitted.tmCommand b/bundles/ruby-on-rails.tmbundle/Commands/Test Uncommitted.tmCommand
deleted file mode 100644
index c9b58f158..000000000
--- a/bundles/ruby-on-rails.tmbundle/Commands/Test Uncommitted.tmCommand	
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>command</key>
-	<string>RUBYLIB="$TM_BUNDLE_SUPPORT/lib:$RUBYLIB"
-"${TM_RUBY:=ruby}" -- "${TM_BUNDLE_SUPPORT}/bin/rake_helper.rb" test:uncommitted</string>
-	<key>input</key>
-	<string>none</string>
-	<key>keyEquivalent</key>
-	<string>^\</string>
-	<key>name</key>
-	<string>Test Uncommitted</string>
-	<key>output</key>
-	<string>showAsHTML</string>
-	<key>scope</key>
-	<string>source.ruby.rails, source.yaml</string>
-	<key>uuid</key>
-	<string>212C3047-D9B1-11DC-94E9-00112475D960</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Commands/Test Units.tmCommand b/bundles/ruby-on-rails.tmbundle/Commands/Test Units.tmCommand
deleted file mode 100644
index f77a38ed9..000000000
--- a/bundles/ruby-on-rails.tmbundle/Commands/Test Units.tmCommand	
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>command</key>
-	<string>RUBYLIB="$TM_BUNDLE_SUPPORT/lib:$RUBYLIB"
-"${TM_RUBY:=ruby}" -- "${TM_BUNDLE_SUPPORT}/bin/rake_helper.rb" test:units</string>
-	<key>input</key>
-	<string>none</string>
-	<key>keyEquivalent</key>
-	<string>^\</string>
-	<key>name</key>
-	<string>Test Units</string>
-	<key>output</key>
-	<string>showAsHTML</string>
-	<key>scope</key>
-	<string>source.ruby.rails, source.yaml</string>
-	<key>uuid</key>
-	<string>2C60CBA1-D9B1-11DC-94E9-00112475D960</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Commands/View demo help.tmCommand b/bundles/ruby-on-rails.tmbundle/Commands/View demo help.tmCommand
deleted file mode 100644
index c05c29c67..000000000
--- a/bundles/ruby-on-rails.tmbundle/Commands/View demo help.tmCommand	
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>command</key>
-	<string>. "$TM_SUPPORT_PATH/lib/webpreview.sh"
-html_header "Ruby on Rails Bundle Help" "Ruby on Rails"
-cat "$TM_BUNDLE_SUPPORT/../website/demo.html"
-html_footer
-
-</string>
-	<key>input</key>
-	<string>none</string>
-	<key>keyEquivalent</key>
-	<string>^h</string>
-	<key>name</key>
-	<string>View demo help</string>
-	<key>output</key>
-	<string>showAsHTML</string>
-	<key>scope</key>
-	<string>source.ruby.rails</string>
-	<key>uuid</key>
-	<string>964436B8-E578-11DC-8177-00112475D960</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/DragCommands/Require Rails File.tmDragCommand b/bundles/ruby-on-rails.tmbundle/DragCommands/Require Rails File.tmDragCommand
deleted file mode 100644
index 72494dd01..000000000
--- a/bundles/ruby-on-rails.tmbundle/DragCommands/Require Rails File.tmDragCommand	
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>command</key>
-	<string>#!/usr/bin/env ruby
-
-file_path = ENV['TM_DROPPED_FILE'].gsub(/\.rb$/, '')
-full_file_path = File.expand_path(file_path)
-relative_path = nil
-known_load_path = %w[app/controllers app/models app/helpers app config lib]
-known_load_path.each do |path|
-  if full_file_path =~ %r{^#{File.join(ENV['TM_PROJECT_DIRECTORY'], path)}/(.*)}
-    relative_path = $1
-    break
-  end
-end
-if relative_path
-  puts "require '#{relative_path}'"
-else
-  puts "require File.dirname(__FILE__) + '/#{file_path}'"
-end
-</string>
-	<key>draggedFileExtensions</key>
-	<array>
-		<string>rb</string>
-	</array>
-	<key>input</key>
-	<string>selection</string>
-	<key>name</key>
-	<string>Require Rails File</string>
-	<key>output</key>
-	<string>insertAsSnippet</string>
-	<key>scope</key>
-	<string>source.ruby.rails</string>
-	<key>uuid</key>
-	<string>56151E60-589F-4CE7-8062-3E087732E2F1</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/LICENSE b/bundles/ruby-on-rails.tmbundle/LICENSE
deleted file mode 100644
index ad7b671f5..000000000
--- a/bundles/ruby-on-rails.tmbundle/LICENSE
+++ /dev/null
@@ -1,7 +0,0 @@
-Copyright (c) 2006 syncPEOPLE, LLC.
-
-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 --git a/bundles/ruby-on-rails.tmbundle/Macros/Add %3A Remove Column.tmMacro b/bundles/ruby-on-rails.tmbundle/Macros/Add %3A Remove Column.tmMacro
deleted file mode 100644
index 5b9fb7152..000000000
--- a/bundles/ruby-on-rails.tmbundle/Macros/Add %3A Remove Column.tmMacro	
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>commands</key>
-	<array>
-		<dict>
-			<key>command</key>
-			<string>deleteWordLeft:</string>
-		</dict>
-		<dict>
-			<key>command</key>
-			<string>moveToBeginningOfLine:</string>
-		</dict>
-		<dict>
-			<key>command</key>
-			<string>moveToEndOfDocumentAndModifySelection:</string>
-		</dict>
-		<dict>
-			<key>argument</key>
-			<dict>
-				<key>command</key>
-				<string>intelligent_migration_snippet.rb add_remove_column</string>
-				<key>input</key>
-				<string>selection</string>
-				<key>output</key>
-				<string>insertAsSnippet</string>
-			</dict>
-			<key>command</key>
-			<string>executeCommandWithOptions:</string>
-		</dict>
-	</array>
-	<key>name</key>
-	<string>Add / Remove Column</string>
-	<key>scope</key>
-	<string>meta.rails.migration - meta.rails.migration.create_table - meta.rails.migration.change_table</string>
-	<key>scopeType</key>
-	<string>local</string>
-	<key>tabTrigger</key>
-	<string>mcol</string>
-	<key>uuid</key>
-	<string>18C76913-061C-4D65-866D-67AA3724AFEF</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Macros/Add %3A Remove Index.tmMacro b/bundles/ruby-on-rails.tmbundle/Macros/Add %3A Remove Index.tmMacro
deleted file mode 100644
index e52e0de03..000000000
--- a/bundles/ruby-on-rails.tmbundle/Macros/Add %3A Remove Index.tmMacro	
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>commands</key>
-	<array>
-		<dict>
-			<key>command</key>
-			<string>deleteWordLeft:</string>
-		</dict>
-		<dict>
-			<key>command</key>
-			<string>moveToBeginningOfLine:</string>
-		</dict>
-		<dict>
-			<key>command</key>
-			<string>moveToEndOfDocumentAndModifySelection:</string>
-		</dict>
-		<dict>
-			<key>argument</key>
-			<dict>
-				<key>command</key>
-				<string>intelligent_migration_snippet.rb add_remove_index</string>
-				<key>input</key>
-				<string>selection</string>
-				<key>output</key>
-				<string>insertAsSnippet</string>
-			</dict>
-			<key>command</key>
-			<string>executeCommandWithOptions:</string>
-		</dict>
-	</array>
-	<key>name</key>
-	<string>Add / Remove Index</string>
-	<key>scope</key>
-	<string>meta.rails.migration - meta.rails.migration.create_table - meta.rails.migration.change_table</string>
-	<key>scopeType</key>
-	<string>local</string>
-	<key>tabTrigger</key>
-	<string>mind</string>
-	<key>uuid</key>
-	<string>95F83E1D-5B03-424F-8BEC-8AF66C8939BC</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Macros/Add %3A Remove Named Index.tmMacro b/bundles/ruby-on-rails.tmbundle/Macros/Add %3A Remove Named Index.tmMacro
deleted file mode 100644
index 4fab72985..000000000
--- a/bundles/ruby-on-rails.tmbundle/Macros/Add %3A Remove Named Index.tmMacro	
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>commands</key>
-	<array>
-		<dict>
-			<key>command</key>
-			<string>deleteWordLeft:</string>
-		</dict>
-		<dict>
-			<key>command</key>
-			<string>moveToBeginningOfLine:</string>
-		</dict>
-		<dict>
-			<key>command</key>
-			<string>moveToEndOfDocumentAndModifySelection:</string>
-		</dict>
-		<dict>
-			<key>argument</key>
-			<dict>
-				<key>command</key>
-				<string>intelligent_migration_snippet.rb add_remove_named_index</string>
-				<key>input</key>
-				<string>selection</string>
-				<key>output</key>
-				<string>insertAsSnippet</string>
-			</dict>
-			<key>command</key>
-			<string>executeCommandWithOptions:</string>
-		</dict>
-	</array>
-	<key>name</key>
-	<string>Add / Remove Named Index</string>
-	<key>scope</key>
-	<string>meta.rails.migration - meta.rails.migration.create_table - meta.rails.migration.change_table</string>
-	<key>scopeType</key>
-	<string>local</string>
-	<key>tabTrigger</key>
-	<string>mind</string>
-	<key>uuid</key>
-	<string>A7F692C1-778A-48B8-945E-573568BA0403</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Macros/Add %3A Remove Several Columns (marcc).tmMacro b/bundles/ruby-on-rails.tmbundle/Macros/Add %3A Remove Several Columns (marcc).tmMacro
deleted file mode 100644
index 81cdce6f1..000000000
--- a/bundles/ruby-on-rails.tmbundle/Macros/Add %3A Remove Several Columns (marcc).tmMacro	
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>commands</key>
-	<array>
-		<dict>
-			<key>command</key>
-			<string>deleteWordLeft:</string>
-		</dict>
-		<dict>
-			<key>command</key>
-			<string>moveToBeginningOfLine:</string>
-		</dict>
-		<dict>
-			<key>command</key>
-			<string>moveToEndOfDocumentAndModifySelection:</string>
-		</dict>
-		<dict>
-			<key>argument</key>
-			<dict>
-				<key>command</key>
-				<string>intelligent_migration_snippet.rb add_remove_column_continue</string>
-				<key>input</key>
-				<string>selection</string>
-				<key>output</key>
-				<string>insertAsSnippet</string>
-			</dict>
-			<key>command</key>
-			<string>executeCommandWithOptions:</string>
-		</dict>
-	</array>
-	<key>name</key>
-	<string>Add / Remove Several Columns (marcc)</string>
-	<key>scope</key>
-	<string>meta.rails.migration - meta.rails.migration.create_table - meta.rails.migration.change_table</string>
-	<key>scopeType</key>
-	<string>local</string>
-	<key>tabTrigger</key>
-	<string>marcc</string>
-	<key>uuid</key>
-	<string>27A6C58A-896B-4956-BA81-D671A2EF9C7D</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Macros/Add %3A Remove Several Columns.tmMacro b/bundles/ruby-on-rails.tmbundle/Macros/Add %3A Remove Several Columns.tmMacro
deleted file mode 100644
index ed6781461..000000000
--- a/bundles/ruby-on-rails.tmbundle/Macros/Add %3A Remove Several Columns.tmMacro	
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>commands</key>
-	<array>
-		<dict>
-			<key>command</key>
-			<string>deleteWordLeft:</string>
-		</dict>
-		<dict>
-			<key>command</key>
-			<string>moveToBeginningOfLine:</string>
-		</dict>
-		<dict>
-			<key>command</key>
-			<string>moveToEndOfDocumentAndModifySelection:</string>
-		</dict>
-		<dict>
-			<key>argument</key>
-			<dict>
-				<key>command</key>
-				<string>intelligent_migration_snippet.rb add_remove_column_continue</string>
-				<key>input</key>
-				<string>selection</string>
-				<key>output</key>
-				<string>insertAsSnippet</string>
-			</dict>
-			<key>command</key>
-			<string>executeCommandWithOptions:</string>
-		</dict>
-	</array>
-	<key>name</key>
-	<string>Add / Remove Several Columns</string>
-	<key>scope</key>
-	<string>meta.rails.migration - meta.rails.migration.create_table - meta.rails.migration.change_table</string>
-	<key>scopeType</key>
-	<string>local</string>
-	<key>tabTrigger</key>
-	<string>mcol</string>
-	<key>uuid</key>
-	<string>7BC860E6-7561-4E6E-983B-507D7A6F6228</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Macros/Add %3A Remove Unique Index.tmMacro b/bundles/ruby-on-rails.tmbundle/Macros/Add %3A Remove Unique Index.tmMacro
deleted file mode 100644
index e41228046..000000000
--- a/bundles/ruby-on-rails.tmbundle/Macros/Add %3A Remove Unique Index.tmMacro	
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>commands</key>
-	<array>
-		<dict>
-			<key>command</key>
-			<string>deleteWordLeft:</string>
-		</dict>
-		<dict>
-			<key>command</key>
-			<string>moveToBeginningOfLine:</string>
-		</dict>
-		<dict>
-			<key>command</key>
-			<string>moveToEndOfDocumentAndModifySelection:</string>
-		</dict>
-		<dict>
-			<key>argument</key>
-			<dict>
-				<key>command</key>
-				<string>intelligent_migration_snippet.rb add_remove_unique_index</string>
-				<key>input</key>
-				<string>selection</string>
-				<key>output</key>
-				<string>insertAsSnippet</string>
-			</dict>
-			<key>command</key>
-			<string>executeCommandWithOptions:</string>
-		</dict>
-	</array>
-	<key>name</key>
-	<string>Add / Remove Unique Index</string>
-	<key>scope</key>
-	<string>meta.rails.migration - meta.rails.migration.create_table - meta.rails.migration.change_table</string>
-	<key>scopeType</key>
-	<string>local</string>
-	<key>tabTrigger</key>
-	<string>mind</string>
-	<key>uuid</key>
-	<string>33057A79-677B-4DFB-99D4-1492778BDDC6</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Macros/Change : Change Table.tmMacro b/bundles/ruby-on-rails.tmbundle/Macros/Change : Change Table.tmMacro
deleted file mode 100644
index 48238093b..000000000
--- a/bundles/ruby-on-rails.tmbundle/Macros/Change : Change Table.tmMacro	
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>commands</key>
-	<array>
-		<dict>
-			<key>command</key>
-			<string>deleteWordLeft:</string>
-		</dict>
-		<dict>
-			<key>command</key>
-			<string>moveToBeginningOfLine:</string>
-		</dict>
-		<dict>
-			<key>command</key>
-			<string>moveToEndOfDocumentAndModifySelection:</string>
-		</dict>
-		<dict>
-			<key>argument</key>
-			<dict>
-				<key>command</key>
-				<string>intelligent_migration_snippet.rb change_change_table</string>
-				<key>input</key>
-				<string>selection</string>
-				<key>output</key>
-				<string>insertAsSnippet</string>
-			</dict>
-			<key>command</key>
-			<string>executeCommandWithOptions:</string>
-		</dict>
-	</array>
-	<key>name</key>
-	<string>Change / Change Table</string>
-	<key>scope</key>
-	<string>meta.rails.migration - meta.rails.migration.create_table - meta.rails.migration.change_table</string>
-	<key>scopeType</key>
-	<string>local</string>
-	<key>tabTrigger</key>
-	<string>mtab</string>
-	<key>uuid</key>
-	<string>20FC02C5-32A3-4F20-B163-FF75C9FDFABF</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Macros/Create %3A Drop Table.tmMacro b/bundles/ruby-on-rails.tmbundle/Macros/Create %3A Drop Table.tmMacro
deleted file mode 100644
index b8a2e24e3..000000000
--- a/bundles/ruby-on-rails.tmbundle/Macros/Create %3A Drop Table.tmMacro	
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>commands</key>
-	<array>
-		<dict>
-			<key>command</key>
-			<string>deleteWordLeft:</string>
-		</dict>
-		<dict>
-			<key>command</key>
-			<string>moveToBeginningOfLine:</string>
-		</dict>
-		<dict>
-			<key>command</key>
-			<string>moveToEndOfDocumentAndModifySelection:</string>
-		</dict>
-		<dict>
-			<key>argument</key>
-			<dict>
-				<key>command</key>
-				<string>intelligent_migration_snippet.rb create_drop_table</string>
-				<key>input</key>
-				<string>selection</string>
-				<key>output</key>
-				<string>insertAsSnippet</string>
-			</dict>
-			<key>command</key>
-			<string>executeCommandWithOptions:</string>
-		</dict>
-	</array>
-	<key>name</key>
-	<string>Create / Drop Table</string>
-	<key>scope</key>
-	<string>meta.rails.migration - meta.rails.migration.create_table - meta.rails.migration.change_table</string>
-	<key>scopeType</key>
-	<string>local</string>
-	<key>tabTrigger</key>
-	<string>mtab</string>
-	<key>uuid</key>
-	<string>25F8F5D8-2BD1-45D8-8B2A-9F2EA4F73AA2</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Macros/Drop %3A Create Table.tmMacro b/bundles/ruby-on-rails.tmbundle/Macros/Drop %3A Create Table.tmMacro
deleted file mode 100644
index 5d7dfb8d4..000000000
--- a/bundles/ruby-on-rails.tmbundle/Macros/Drop %3A Create Table.tmMacro	
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>commands</key>
-	<array>
-		<dict>
-			<key>command</key>
-			<string>moveToBeginningOfLine:</string>
-		</dict>
-		<dict>
-			<key>command</key>
-			<string>moveToEndOfDocumentAndModifySelection:</string>
-		</dict>
-		<dict>
-			<key>argument</key>
-			<dict>
-				<key>command</key>
-				<string>insert_add_column_or_create_table.rb</string>
-				<key>input</key>
-				<string>selection</string>
-				<key>output</key>
-				<string>replaceSelectedText</string>
-			</dict>
-			<key>command</key>
-			<string>executeCommandWithOptions:</string>
-		</dict>
-		<dict>
-			<key>command</key>
-			<string>moveToBeginningOfLine:</string>
-		</dict>
-		<dict>
-			<key>command</key>
-			<string>moveToEndOfLine:</string>
-		</dict>
-	</array>
-	<key>name</key>
-	<string>Drop / Create Table (Second Half)</string>
-	<key>scope</key>
-	<string>meta.rails.migration - meta.rails.migration.create_table - meta.rails.migration.change_table</string>
-	<key>scopeType</key>
-	<string>local</string>
-	<key>tabTrigger</key>
-	<string>[press tab twice to generate create_table]</string>
-	<key>uuid</key>
-	<string>A2135370-67A1-488D-B43C-B4F221127C2F</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Macros/Remove %3A Add Column.tmMacro b/bundles/ruby-on-rails.tmbundle/Macros/Remove %3A Add Column.tmMacro
deleted file mode 100644
index 195fd3c59..000000000
--- a/bundles/ruby-on-rails.tmbundle/Macros/Remove %3A Add Column.tmMacro	
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>commands</key>
-	<array>
-		<dict>
-			<key>command</key>
-			<string>moveToBeginningOfLine:</string>
-		</dict>
-		<dict>
-			<key>command</key>
-			<string>moveToEndOfDocumentAndModifySelection:</string>
-		</dict>
-		<dict>
-			<key>argument</key>
-			<dict>
-				<key>command</key>
-				<string>insert_add_column_or_create_table.rb</string>
-				<key>input</key>
-				<string>selection</string>
-				<key>output</key>
-				<string>replaceSelectedText</string>
-			</dict>
-			<key>command</key>
-			<string>executeCommandWithOptions:</string>
-		</dict>
-		<dict>
-			<key>command</key>
-			<string>moveToBeginningOfLine:</string>
-		</dict>
-		<dict>
-			<key>command</key>
-			<string>moveToEndOfLine:</string>
-		</dict>
-	</array>
-	<key>name</key>
-	<string>Remove / Add Column (Second Half)</string>
-	<key>scope</key>
-	<string>meta.rails.migration - meta.rails.migration.create_table - meta.rails.migration.change_table</string>
-	<key>scopeType</key>
-	<string>local</string>
-	<key>tabTrigger</key>
-	<string>[press tab twice to generate add_column]</string>
-	<key>uuid</key>
-	<string>809BCA42-5C49-4B08-B3C4-BB773036C086</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Macros/Rename %3A Rename Several Columns (mncc).tmMacro b/bundles/ruby-on-rails.tmbundle/Macros/Rename %3A Rename Several Columns (mncc).tmMacro
deleted file mode 100644
index d97a9c2f3..000000000
--- a/bundles/ruby-on-rails.tmbundle/Macros/Rename %3A Rename Several Columns (mncc).tmMacro	
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>commands</key>
-	<array>
-		<dict>
-			<key>command</key>
-			<string>deleteWordLeft:</string>
-		</dict>
-		<dict>
-			<key>command</key>
-			<string>moveToBeginningOfLine:</string>
-		</dict>
-		<dict>
-			<key>command</key>
-			<string>moveToEndOfDocumentAndModifySelection:</string>
-		</dict>
-		<dict>
-			<key>argument</key>
-			<dict>
-				<key>command</key>
-				<string>intelligent_migration_snippet.rb rename_column_continue</string>
-				<key>input</key>
-				<string>selection</string>
-				<key>output</key>
-				<string>insertAsSnippet</string>
-			</dict>
-			<key>command</key>
-			<string>executeCommandWithOptions:</string>
-		</dict>
-	</array>
-	<key>name</key>
-	<string>Rename / Rename Several Columns (mncc)</string>
-	<key>scope</key>
-	<string>meta.rails.migration - meta.rails.migration.create_table - meta.rails.migration.change_table</string>
-	<key>scopeType</key>
-	<string>local</string>
-	<key>tabTrigger</key>
-	<string>mncc</string>
-	<key>uuid</key>
-	<string>04A86178-71B1-430A-A06D-DFF7C9A338B5</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Macros/Rename %3A Rename Several Columns.tmMacro b/bundles/ruby-on-rails.tmbundle/Macros/Rename %3A Rename Several Columns.tmMacro
deleted file mode 100644
index d35cfc368..000000000
--- a/bundles/ruby-on-rails.tmbundle/Macros/Rename %3A Rename Several Columns.tmMacro	
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>commands</key>
-	<array>
-		<dict>
-			<key>command</key>
-			<string>deleteWordLeft:</string>
-		</dict>
-		<dict>
-			<key>command</key>
-			<string>moveToBeginningOfLine:</string>
-		</dict>
-		<dict>
-			<key>command</key>
-			<string>moveToEndOfDocumentAndModifySelection:</string>
-		</dict>
-		<dict>
-			<key>argument</key>
-			<dict>
-				<key>command</key>
-				<string>intelligent_migration_snippet.rb rename_column_continue</string>
-				<key>input</key>
-				<string>selection</string>
-				<key>output</key>
-				<string>insertAsSnippet</string>
-			</dict>
-			<key>command</key>
-			<string>executeCommandWithOptions:</string>
-		</dict>
-	</array>
-	<key>name</key>
-	<string>Rename / Rename Several Columns</string>
-	<key>scope</key>
-	<string>meta.rails.migration - meta.rails.migration.create_table - meta.rails.migration.change_table</string>
-	<key>scopeType</key>
-	<string>local</string>
-	<key>tabTrigger</key>
-	<string>mcol</string>
-	<key>uuid</key>
-	<string>F03162DE-9DB6-417B-9DD7-52D9F11EA736</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Macros/Rename Column.tmMacro b/bundles/ruby-on-rails.tmbundle/Macros/Rename Column.tmMacro
deleted file mode 100644
index 36cf7651b..000000000
--- a/bundles/ruby-on-rails.tmbundle/Macros/Rename Column.tmMacro	
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>commands</key>
-	<array>
-		<dict>
-			<key>command</key>
-			<string>deleteWordLeft:</string>
-		</dict>
-		<dict>
-			<key>command</key>
-			<string>moveToBeginningOfLine:</string>
-		</dict>
-		<dict>
-			<key>command</key>
-			<string>moveToEndOfDocumentAndModifySelection:</string>
-		</dict>
-		<dict>
-			<key>argument</key>
-			<dict>
-				<key>command</key>
-				<string>intelligent_migration_snippet.rb rename_column</string>
-				<key>input</key>
-				<string>selection</string>
-				<key>output</key>
-				<string>insertAsSnippet</string>
-			</dict>
-			<key>command</key>
-			<string>executeCommandWithOptions:</string>
-		</dict>
-	</array>
-	<key>name</key>
-	<string>Rename / Rename Column</string>
-	<key>scope</key>
-	<string>meta.rails.migration - meta.rails.migration.create_table - meta.rails.migration.change_table</string>
-	<key>scopeType</key>
-	<string>local</string>
-	<key>tabTrigger</key>
-	<string>mcol</string>
-	<key>uuid</key>
-	<string>AC50762C-DE40-4EB9-9A22-2F6AF2EA4EA3</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Macros/Rename Table.tmMacro b/bundles/ruby-on-rails.tmbundle/Macros/Rename Table.tmMacro
deleted file mode 100644
index 900da4b9f..000000000
--- a/bundles/ruby-on-rails.tmbundle/Macros/Rename Table.tmMacro	
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>commands</key>
-	<array>
-		<dict>
-			<key>command</key>
-			<string>deleteWordLeft:</string>
-		</dict>
-		<dict>
-			<key>command</key>
-			<string>moveToBeginningOfLine:</string>
-		</dict>
-		<dict>
-			<key>command</key>
-			<string>moveToEndOfDocumentAndModifySelection:</string>
-		</dict>
-		<dict>
-			<key>argument</key>
-			<dict>
-				<key>command</key>
-				<string>intelligent_migration_snippet.rb rename_table</string>
-				<key>input</key>
-				<string>selection</string>
-				<key>output</key>
-				<string>insertAsSnippet</string>
-			</dict>
-			<key>command</key>
-			<string>executeCommandWithOptions:</string>
-		</dict>
-	</array>
-	<key>name</key>
-	<string>Rename / Rename Table</string>
-	<key>scope</key>
-	<string>meta.rails.migration - meta.rails.migration.create_table - meta.rails.migration.change_table</string>
-	<key>scopeType</key>
-	<string>local</string>
-	<key>tabTrigger</key>
-	<string>mtab</string>
-	<key>uuid</key>
-	<string>FD8CC811-2AD3-480F-B975-DF959DC96C67</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Preferences/Template (ERB).tmPreferences b/bundles/ruby-on-rails.tmbundle/Preferences/Template (ERB).tmPreferences
deleted file mode 100644
index 613fe5663..000000000
--- a/bundles/ruby-on-rails.tmbundle/Preferences/Template (ERB).tmPreferences	
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>name</key>
-	<string>Template (ERB)</string>
-	<key>scope</key>
-	<string>text.html.ruby</string>
-	<key>settings</key>
-	<dict>
-		<key>shellVariables</key>
-		<array>
-			<dict>
-				<key>name</key>
-				<string>TM_RAILS_TEMPLATE_START_RUBY_EXPR</string>
-				<key>value</key>
-				<string>&lt;%= </string>
-			</dict>
-			<dict>
-				<key>name</key>
-				<string>TM_RAILS_TEMPLATE_END_RUBY_EXPR</string>
-				<key>value</key>
-				<string> %&gt;</string>
-			</dict>
-			<dict>
-				<key>name</key>
-				<string>TM_RAILS_TEMPLATE_START_RUBY_INLINE</string>
-				<key>value</key>
-				<string>&lt;% </string>
-			</dict>
-			<dict>
-				<key>name</key>
-				<string>TM_RAILS_TEMPLATE_END_RUBY_INLINE</string>
-				<key>value</key>
-				<string> -%&gt;</string>
-			</dict>
-			<dict>
-				<key>name</key>
-				<string>TM_RAILS_TEMPLATE_END_RUBY_BLOCK</string>
-				<key>value</key>
-				<string>&lt;% end -%&gt;</string>
-			</dict>
-		</array>
-	</dict>
-	<key>uuid</key>
-	<string>87EF33FE-E918-11DC-A399-00112475D960</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Preferences/Template (Haml).tmPreferences b/bundles/ruby-on-rails.tmbundle/Preferences/Template (Haml).tmPreferences
deleted file mode 100644
index c0ab0b814..000000000
--- a/bundles/ruby-on-rails.tmbundle/Preferences/Template (Haml).tmPreferences	
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>name</key>
-	<string>Template (Haml)</string>
-	<key>scope</key>
-	<string>text.haml</string>
-	<key>settings</key>
-	<dict>
-		<key>shellVariables</key>
-		<array>
-			<dict>
-				<key>name</key>
-				<string>TM_RAILS_TEMPLATE_START_RUBY_EXPR</string>
-				<key>value</key>
-				<string>= </string>
-			</dict>
-			<dict>
-				<key>name</key>
-				<string>TM_RAILS_TEMPLATE_END_RUBY_EXPR</string>
-				<key>value</key>
-				<string></string>
-			</dict>
-			<dict>
-				<key>name</key>
-				<string>TM_RAILS_TEMPLATE_START_RUBY_INLINE</string>
-				<key>value</key>
-				<string>- </string>
-			</dict>
-			<dict>
-				<key>name</key>
-				<string>TM_RAILS_TEMPLATE_END_RUBY_INLINE</string>
-				<key>value</key>
-				<string></string>
-			</dict>
-			<dict>
-				<key>name</key>
-				<string>TM_RAILS_TEMPLATE_END_RUBY_BLOCK</string>
-				<key>value</key>
-				<string></string>
-			</dict>
-		</array>
-	</dict>
-	<key>uuid</key>
-	<string>C0FD2646-E924-11DC-A399-00112475D960</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/README b/bundles/ruby-on-rails.tmbundle/README
deleted file mode 100644
index 8993ecb1c..000000000
--- a/bundles/ruby-on-rails.tmbundle/README
+++ /dev/null
@@ -1,38 +0,0 @@
-TextMate bundle for Ruby on Rails development
-
-GET IT NOW: with Rails 2.0 support.
-
-Rails 2.0 (copied from CHANGELOG)
-
-* Snippets/Commands for:
-  * Tests
-    * assert_select (ass)
-    * assert_difference/assert_no_difference (asd/asnd)
-    * GET+POST test method stubs (defg+defp)
-  * Controllers
-    * respond_to (rst)
-    * REMOVED: render_component snippets
-    * loggers - pass a block instead of raw string to save time if logging not used (e.g. production) [thx Stephen Touset]
-    * redirect_to for resource paths (rep, repp, renp, renpp)
-    * render :update (ru) [thx Simon Jefford]
-  * Views
-    * form_for (ff)
-    * link_to for resource paths (lip, lipp, linp, linpp)
-    * <% end -%> (end)
-  * Models
-    * has_many :though (hmt)
-    * association snippets give better defaults (e.g. bt + hm)
-    * validates_format_of (vf,vfif) [thx Dean Strelau]
-  * Migrations
-    * Sexy Migrations now available as "t." snippets [thx Lawrence Pit]
-    * Migration classes have own textmate scope
-    * Add/Remove Columns - the 'down' statements are in reverse order [thx Lawrence Pit, Daniel Kristensen]
-* Language/Syntax
-  * New keywords: rescue_from
-  * Added rb as a valid Rails file type [thx James Deville]
-* Commands
-  * html.erb is the default for new templates (backwards compatibility is being worked on too)
-* Plugins
-  * Footnote
-    * footnote-edge uses .erb for templates [thx Stephen Bannasch]
-
diff --git a/bundles/ruby-on-rails.tmbundle/Rakefile b/bundles/ruby-on-rails.tmbundle/Rakefile
deleted file mode 100644
index ecab394b6..000000000
--- a/bundles/ruby-on-rails.tmbundle/Rakefile
+++ /dev/null
@@ -1,19 +0,0 @@
-require 'rubygems'
-require 'rake'
-require 'rake/testtask'
-
-APP_VERSION="2.0.0"
-APP_NAME='Ruby on Rails.tmbundle'
-APP_ROOT=File.dirname(__FILE__)
-
-RUBY_APP='ruby'
-
-desc "TMBundle Test Task"
-task :default => [ :test ]
-Rake::TestTask.new { |t|
-  t.libs << "test"
-  t.pattern = 'Support/test/*_test.rb'
-  t.verbose = true
-  t.warning = false
-}
-Dir['tasks/**/*.rake'].each { |file| load file }
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/$LABEL.tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/$LABEL.tmSnippet
deleted file mode 100644
index 9016c98dc..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/$LABEL.tmSnippet
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>\$LABEL</string>
-	<key>name</key>
-	<string>$LABEL</string>
-	<key>scope</key>
-	<string>source.yaml</string>
-	<key>tabTrigger</key>
-	<string>$L</string>
-	<key>uuid</key>
-	<string>786980D8-FA69-4542-85A3-5E48CFAA6814</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/%3C%= Fixtures_identify(%3Asymbol) %%3E.tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/%3C%= Fixtures_identify(%3Asymbol) %%3E.tmSnippet
deleted file mode 100644
index f171943ab..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/%3C%= Fixtures_identify(%3Asymbol) %%3E.tmSnippet	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>${TM_RAILS_TEMPLATE_START_RUBY_EXPR}Fixtures.identify(:${1:name})${TM_RAILS_TEMPLATE_END_RUBY_EXPR}$0</string>
-	<key>name</key>
-	<string>&lt;%= Fixtures.identify(:symbol) %&gt;</string>
-	<key>scope</key>
-	<string>source.yaml</string>
-	<key>tabTrigger</key>
-	<string>fi</string>
-	<key>uuid</key>
-	<string>9671EB7A-89D6-4C23-914F-88CBEE0D177A</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/180 rails form_tag.plist b/bundles/ruby-on-rails.tmbundle/Snippets/180 rails form_tag.plist
deleted file mode 100644
index af4e443a2..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/180 rails form_tag.plist	
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>${TM_RAILS_TEMPLATE_START_RUBY_INLINE}form_tag(${1::action =&gt; "${5:update}"}${6:, {:${8:class} =&gt; "${9:form}"\}}) do${TM_RAILS_TEMPLATE_END_RUBY_EXPR}
-  $0
-${TM_RAILS_TEMPLATE_END_RUBY_BLOCK}</string>
-	<key>name</key>
-	<string>form_tag</string>
-	<key>scope</key>
-	<string>text.html.ruby, text.haml</string>
-	<key>tabTrigger</key>
-	<string>ft</string>
-	<key>uuid</key>
-	<string>F0F6DACA-6A0B-11D9-BDC2-000D932CD5BA</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/Create binary column.tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/Create binary column.tmSnippet
deleted file mode 100644
index 1415d5095..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/Create binary column.tmSnippet	
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>t.binary :${1:title}${2:, :limit =&gt; ${3:2}.megabytes}
-$0</string>
-	<key>name</key>
-	<string>Table column binary</string>
-	<key>scope</key>
-	<string>meta.rails.migration.create_table, meta.rails.migration.change_table</string>
-	<key>tabTrigger</key>
-	<string>tcbi</string>
-	<key>uuid</key>
-	<string>5E9B8B0E-D532-11DC-BD8E-00112475D960</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/Create boolean column.tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/Create boolean column.tmSnippet
deleted file mode 100644
index 80789efac..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/Create boolean column.tmSnippet	
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>t.boolean :${1:title}
-$0</string>
-	<key>name</key>
-	<string>Table column boolean</string>
-	<key>scope</key>
-	<string>meta.rails.migration.create_table, meta.rails.migration.change_table</string>
-	<key>tabTrigger</key>
-	<string>tcb</string>
-	<key>uuid</key>
-	<string>967093B4-D532-11DC-BD8E-00112475D960</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/Create controller class.tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/Create controller class.tmSnippet
deleted file mode 100644
index a6889304a..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/Create controller class.tmSnippet	
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>class ${1:Model}Controller &lt; ApplicationController
-	before_filter :find_${2:model}
-
-	$0
-
-	private
-	def find_${2}
-		@$2 = ${3:$1}.find(params[:id]) if params[:id]
-	end
-end</string>
-	<key>name</key>
-	<string>Create controller class</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>cla</string>
-	<key>uuid</key>
-	<string>4B3F798E-E3B6-48C8-8C2F-CB8631011638</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/Create date column.tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/Create date column.tmSnippet
deleted file mode 100644
index 6964d0474..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/Create date column.tmSnippet	
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>t.date :${1:title}
-$0</string>
-	<key>name</key>
-	<string>Table column date</string>
-	<key>scope</key>
-	<string>meta.rails.migration.create_table, meta.rails.migration.change_table</string>
-	<key>tabTrigger</key>
-	<string>tcda</string>
-	<key>uuid</key>
-	<string>56276686-D532-11DC-BD8E-00112475D960</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/Create datetime column.tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/Create datetime column.tmSnippet
deleted file mode 100644
index 2e69fe4b7..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/Create datetime column.tmSnippet	
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>t.datetime :${1:title}
-$0</string>
-	<key>name</key>
-	<string>Table column datetime</string>
-	<key>scope</key>
-	<string>meta.rails.migration.create_table, meta.rails.migration.change_table</string>
-	<key>tabTrigger</key>
-	<string>tcdt</string>
-	<key>uuid</key>
-	<string>D6CBCA96-D52F-11DC-BD8E-00112475D960</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/Create decimal column.tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/Create decimal column.tmSnippet
deleted file mode 100644
index 82e9703e4..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/Create decimal column.tmSnippet	
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>t.decimal :${1:title}${2:${3:, :precision =&gt; ${4:10}}${5:, :scale =&gt; ${6:2}}}
-$0</string>
-	<key>name</key>
-	<string>Table column decimal</string>
-	<key>scope</key>
-	<string>meta.rails.migration.create_table, meta.rails.migration.change_table</string>
-	<key>tabTrigger</key>
-	<string>tcd</string>
-	<key>uuid</key>
-	<string>93A16768-D52E-11DC-BD8E-00112475D960</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/Create float column.tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/Create float column.tmSnippet
deleted file mode 100644
index abd80a958..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/Create float column.tmSnippet	
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>t.float :${1:title}
-$0</string>
-	<key>name</key>
-	<string>Table column float</string>
-	<key>scope</key>
-	<string>meta.rails.migration.create_table, meta.rails.migration.change_table</string>
-	<key>tabTrigger</key>
-	<string>tcf</string>
-	<key>uuid</key>
-	<string>8AF989C4-D52E-11DC-BD8E-00112475D960</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/Create functional test class.tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/Create functional test class.tmSnippet
deleted file mode 100644
index 3ea76b2c5..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/Create functional test class.tmSnippet	
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>require File.dirname(__FILE__) + '/../test_helper'
-
-class ${1:Model}ControllerTest &lt; ActionController::TestCase
-	deft$0
-end
-</string>
-	<key>name</key>
-	<string>Create functional test class</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>cla</string>
-	<key>uuid</key>
-	<string>F60D0630-CBF5-4283-9D20-FA46C787A88D</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/Create integer column.tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/Create integer column.tmSnippet
deleted file mode 100644
index aafb6e0ed..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/Create integer column.tmSnippet	
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>t.integer :${1:title}
-$0</string>
-	<key>name</key>
-	<string>Table column integer</string>
-	<key>scope</key>
-	<string>meta.rails.migration.create_table, meta.rails.migration.change_table</string>
-	<key>tabTrigger</key>
-	<string>tci</string>
-	<key>uuid</key>
-	<string>729D559E-D52D-11DC-BD8E-00112475D960</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/Create lock_version column.tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/Create lock_version column.tmSnippet
deleted file mode 100644
index 362518c52..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/Create lock_version column.tmSnippet	
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>t.integer :lock_version, :null =&gt; false, :default =&gt; 0
-$0</string>
-	<key>name</key>
-	<string>Table column lock_version</string>
-	<key>scope</key>
-	<string>meta.rails.migration.create_table, meta.rails.migration.change_table</string>
-	<key>tabTrigger</key>
-	<string>tcl</string>
-	<key>uuid</key>
-	<string>FC2523C1-D532-11DC-BD8E-00112475D960</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/Create references column.tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/Create references column.tmSnippet
deleted file mode 100644
index 85c7d6429..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/Create references column.tmSnippet	
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>t.references :${1:taggable}${2:, :polymorphic =&gt; ${3:{ :default =&gt; '${4:Photo}' \}}}
-$0</string>
-	<key>name</key>
-	<string>Table column(s) references</string>
-	<key>scope</key>
-	<string>meta.rails.migration.create_table, meta.rails.migration.change_table</string>
-	<key>tabTrigger</key>
-	<string>tcr</string>
-	<key>uuid</key>
-	<string>EDA6568B-D533-11DC-BD8E-00112475D960</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/Create string column.tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/Create string column.tmSnippet
deleted file mode 100644
index f9a589e06..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/Create string column.tmSnippet	
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>t.string :${1:title}
-$0</string>
-	<key>name</key>
-	<string>Table column string</string>
-	<key>scope</key>
-	<string>meta.rails.migration.create_table, meta.rails.migration.change_table</string>
-	<key>tabTrigger</key>
-	<string>tcs</string>
-	<key>uuid</key>
-	<string>377BF814-D52D-11DC-BD8E-00112475D960</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/Create text column.tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/Create text column.tmSnippet
deleted file mode 100644
index d76545ad5..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/Create text column.tmSnippet	
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>t.text :${1:title}
-$0</string>
-	<key>name</key>
-	<string>Table column text</string>
-	<key>scope</key>
-	<string>meta.rails.migration.create_table, meta.rails.migration.change_table</string>
-	<key>tabTrigger</key>
-	<string>tct</string>
-	<key>uuid</key>
-	<string>6A9D4C30-D52D-11DC-BD8E-00112475D960</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/Create time column.tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/Create time column.tmSnippet
deleted file mode 100644
index 08baf008d..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/Create time column.tmSnippet	
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>t.time :${1:title}
-$0</string>
-	<key>name</key>
-	<string>Table column time</string>
-	<key>scope</key>
-	<string>meta.rails.migration.create_table, meta.rails.migration.change_table</string>
-	<key>tabTrigger</key>
-	<string>tcti</string>
-	<key>uuid</key>
-	<string>4F5DDD37-D532-11DC-BD8E-00112475D960</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/Create timestamp column.tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/Create timestamp column.tmSnippet
deleted file mode 100644
index 4af537cc8..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/Create timestamp column.tmSnippet	
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>t.timestamp :${1:title}
-$0</string>
-	<key>name</key>
-	<string>Table column timestamp</string>
-	<key>scope</key>
-	<string>meta.rails.migration.create_table, meta.rails.migration.change_table</string>
-	<key>tabTrigger</key>
-	<string>tcts</string>
-	<key>uuid</key>
-	<string>4600CE20-D532-11DC-BD8E-00112475D960</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/Create timestamps columns.tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/Create timestamps columns.tmSnippet
deleted file mode 100644
index a59d2fcae..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/Create timestamps columns.tmSnippet	
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>t.timestamps
-$0</string>
-	<key>name</key>
-	<string>Table column timestamps</string>
-	<key>scope</key>
-	<string>meta.rails.migration.create_table, meta.rails.migration.change_table</string>
-	<key>tabTrigger</key>
-	<string>tctss</string>
-	<key>uuid</key>
-	<string>E0C8FDC4-D532-11DC-BD8E-00112475D960</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/Migration Create Column (mcc).plist b/bundles/ruby-on-rails.tmbundle/Snippets/Migration Create Column (mcc).plist
deleted file mode 100644
index 8d82b60e6..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/Migration Create Column (mcc).plist	
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>t.column ${1:title}, :${2:string}
-$0</string>
-	<key>name</key>
-	<string>Create Column in Table</string>
-	<key>scope</key>
-	<string>meta.rails.migration.create_table</string>
-	<key>tabTrigger</key>
-	<string>mcol</string>
-	<key>uuid</key>
-	<string>7592CA99-75D7-48B6-9133-00B9F148FF43</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/Migration Create Column Continue (mccc).plist b/bundles/ruby-on-rails.tmbundle/Snippets/Migration Create Column Continue (mccc).plist
deleted file mode 100644
index cbe15cdf9..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/Migration Create Column Continue (mccc).plist	
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>t.column ${1:title}, :${2:string}
-mccc$0</string>
-	<key>name</key>
-	<string>Create Several Columns in Table</string>
-	<key>scope</key>
-	<string>meta.rails.migration.create_table</string>
-	<key>tabTrigger</key>
-	<string>mccc</string>
-	<key>uuid</key>
-	<string>67FD2F8F-5F25-45F2-A451-2F39977A9EDE</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/Migration Drop Create Table (mdct).plist b/bundles/ruby-on-rails.tmbundle/Snippets/Migration Drop Create Table (mdct).plist
deleted file mode 100644
index 465ca0c7f..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/Migration Drop Create Table (mdct).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>drop_table :${1:table}${2: [press tab twice to generate create_table]}</string>
-	<key>name</key>
-	<string>Drop / Create Table</string>
-	<key>scope</key>
-	<string>meta.rails.migration - meta.rails.migration.create_table - meta.rails.migration.change_table</string>
-	<key>tabTrigger</key>
-	<string>mtab</string>
-	<key>uuid</key>
-	<string>20375601-B13F-4314-B8E4-362706566636</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/Migration Remove and Add Column (mrac).plist b/bundles/ruby-on-rails.tmbundle/Snippets/Migration Remove and Add Column (mrac).plist
deleted file mode 100644
index c94410f6f..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/Migration Remove and Add Column (mrac).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>remove_column :${1:table}, :${2:column}${3: [press tab twice to generate add_column]}</string>
-	<key>name</key>
-	<string>Remove / Add Column</string>
-	<key>scope</key>
-	<string>meta.rails.migration - meta.rails.migration.create_table - meta.rails.migration.change_table</string>
-	<key>tabTrigger</key>
-	<string>mcol</string>
-	<key>uuid</key>
-	<string>16A705EB-10DC-42B5-9FF2-377E206421DC</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/RAILS_DEFAULT_LOGGER.debug (rdb).plist b/bundles/ruby-on-rails.tmbundle/Snippets/RAILS_DEFAULT_LOGGER.debug (rdb).plist
deleted file mode 100644
index 2e03699d7..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/RAILS_DEFAULT_LOGGER.debug (rdb).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>RAILS_DEFAULT_LOGGER.debug "${1:message}"$0</string>
-	<key>name</key>
-	<string>RAILS_DEFAULT_LOGGER.debug</string>
-	<key>scope</key>
-	<string>source.ruby.rails</string>
-	<key>tabTrigger</key>
-	<string>rdb</string>
-	<key>uuid</key>
-	<string>7B15B396-1F41-4529-9253-32761E94448C</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/Table column(s) rename.tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/Table column(s) rename.tmSnippet
deleted file mode 100644
index 3b0fbb23c..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/Table column(s) rename.tmSnippet	
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>t.rename(:${1:old_column_name}, :${2:new_column_name})
-$0</string>
-	<key>name</key>
-	<string>Table column(s) rename</string>
-	<key>scope</key>
-	<string>meta.rails.migration.create_table, meta.rails.migration.change_table</string>
-	<key>tabTrigger</key>
-	<string>tre</string>
-	<key>uuid</key>
-	<string>DF30226E-1111-448A-B669-7CA34EE83909</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/Test Assert Redirected To (art).plist b/bundles/ruby-on-rails.tmbundle/Snippets/Test Assert Redirected To (art).plist
deleted file mode 100644
index f0f63e285..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/Test Assert Redirected To (art).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>assert_redirected_to ${2::action =&gt; "${1:index}"}</string>
-	<key>name</key>
-	<string>assert_redirected_to</string>
-	<key>scope</key>
-	<string>source.ruby.rails</string>
-	<key>tabTrigger</key>
-	<string>art</string>
-	<key>uuid</key>
-	<string>CD60F800-850D-47CF-BE32-3DE665DD5C68</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/Test Assert Response (are).plist b/bundles/ruby-on-rails.tmbundle/Snippets/Test Assert Response (are).plist
deleted file mode 100644
index 34750af30..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/Test Assert Response (are).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>assert_response :${1:success}, @response.body$0</string>
-	<key>name</key>
-	<string>assert_response</string>
-	<key>scope</key>
-	<string>source.ruby.rails</string>
-	<key>tabTrigger</key>
-	<string>asre</string>
-	<key>uuid</key>
-	<string>2BD82DCB-1F19-4C8F-BC70-C0BBB06A2138</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/after_create.tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/after_create.tmSnippet
deleted file mode 100644
index d335ffec9..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/after_create.tmSnippet
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>after_create </string>
-	<key>name</key>
-	<string>after_create</string>
-	<key>scope</key>
-	<string>source.ruby.rails</string>
-	<key>tabTrigger</key>
-	<string>aftc</string>
-	<key>uuid</key>
-	<string>279D1981-B055-4693-B9AF-5B571A62A6AE</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/after_destroy.tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/after_destroy.tmSnippet
deleted file mode 100644
index 874247ca4..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/after_destroy.tmSnippet
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>after_destroy </string>
-	<key>name</key>
-	<string>after_destroy</string>
-	<key>scope</key>
-	<string>source.ruby.rails</string>
-	<key>tabTrigger</key>
-	<string>aftd</string>
-	<key>uuid</key>
-	<string>A2F3E8C1-4216-4890-8491-2F8C7534ED03</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/after_save.tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/after_save.tmSnippet
deleted file mode 100644
index b0e6d2db5..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/after_save.tmSnippet
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>after_save </string>
-	<key>name</key>
-	<string>after_save</string>
-	<key>scope</key>
-	<string>source.ruby.rails</string>
-	<key>tabTrigger</key>
-	<string>afts</string>
-	<key>uuid</key>
-	<string>4D1787E3-1583-4CF3-8D99-CC45D7C35EED</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/after_update.tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/after_update.tmSnippet
deleted file mode 100644
index a21a4707c..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/after_update.tmSnippet
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>after_update </string>
-	<key>name</key>
-	<string>after_update</string>
-	<key>scope</key>
-	<string>source.ruby.rails</string>
-	<key>tabTrigger</key>
-	<string>aftu</string>
-	<key>uuid</key>
-	<string>0C9EA1A1-66C5-4E1C-9C30-E1FFE8EC6EAE</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/after_validation.tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/after_validation.tmSnippet
deleted file mode 100644
index 97c367ac2..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/after_validation.tmSnippet
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>after_validation </string>
-	<key>name</key>
-	<string>after_validation</string>
-	<key>scope</key>
-	<string>source.ruby.rails</string>
-	<key>tabTrigger</key>
-	<string>aftv</string>
-	<key>uuid</key>
-	<string>44FBD811-70A9-462B-AC56-F975ADAD62AF</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/after_validation_on_create.tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/after_validation_on_create.tmSnippet
deleted file mode 100644
index 2dcf7f9a7..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/after_validation_on_create.tmSnippet
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>after_validation_on_create </string>
-	<key>name</key>
-	<string>after_validation_on_create</string>
-	<key>scope</key>
-	<string>source.ruby.rails</string>
-	<key>tabTrigger</key>
-	<string>aftvoc</string>
-	<key>uuid</key>
-	<string>BA0DE6C7-EAD3-42C9-8ABB-2B9A5F2FE225</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/after_validation_on_update.tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/after_validation_on_update.tmSnippet
deleted file mode 100644
index 7aa427152..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/after_validation_on_update.tmSnippet
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>after_validation_on_update </string>
-	<key>name</key>
-	<string>after_validation_on_update</string>
-	<key>scope</key>
-	<string>source.ruby.rails</string>
-	<key>tabTrigger</key>
-	<string>aftvou</string>
-	<key>uuid</key>
-	<string>BCB25D36-2D3F-41E9-B2CF-37D6E883E8D1</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/assert(var = assigns(%3Avar)).tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/assert(var = assigns(%3Avar)).tmSnippet
deleted file mode 100644
index 002825556..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/assert(var = assigns(%3Avar)).tmSnippet	
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>assert(${1:var} = assigns(:${1}), "Cannot find @${1}")
-$0</string>
-	<key>name</key>
-	<string>assert(var = assigns(:var))</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>asg</string>
-	<key>uuid</key>
-	<string>FE9C4B4E-860D-49F0-AAF7-5582B98F5F54</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/assert_difference.tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/assert_difference.tmSnippet
deleted file mode 100644
index ac28af8a8..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/assert_difference.tmSnippet
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>assert_difference "${1:Model}.${2:count}", ${3:1} do
-  $0
-end</string>
-	<key>name</key>
-	<string>assert_difference</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>asd</string>
-	<key>uuid</key>
-	<string>30BEA6FB-301C-4460-93EC-FA3404688962</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/assert_no_difference.tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/assert_no_difference.tmSnippet
deleted file mode 100644
index fa7f7afa5..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/assert_no_difference.tmSnippet
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>assert_no_difference "${1:Model}.${2:count}" do
-  $0
-end</string>
-	<key>name</key>
-	<string>assert_no_difference</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>asnd</string>
-	<key>uuid</key>
-	<string>5C6F4462-70E6-40B4-B3F2-F371656E7784</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/assert_redirected_to (nested path plural).tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/assert_redirected_to (nested path plural).tmSnippet
deleted file mode 100644
index 3ed29c1b3..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/assert_redirected_to (nested path plural).tmSnippet	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>assert_redirected_to ${10:${2:parent}_${3:child}_path(${4:@}${5:${2}})}</string>
-	<key>name</key>
-	<string>assert_redirected_to (nested path plural)</string>
-	<key>scope</key>
-	<string>source.ruby.rails</string>
-	<key>tabTrigger</key>
-	<string>artnpp</string>
-	<key>uuid</key>
-	<string>4C92C020-7337-4D6E-91EE-7ABF2BFC7F41</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/assert_redirected_to (nested path).tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/assert_redirected_to (nested path).tmSnippet
deleted file mode 100644
index f833cff21..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/assert_redirected_to (nested path).tmSnippet	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>assert_redirected_to ${2:${12:parent}_${13:child}_path(${14:@}${15:${12}}, ${16:@}${17:${13}})}</string>
-	<key>name</key>
-	<string>assert_redirected_to (nested path)</string>
-	<key>scope</key>
-	<string>source.ruby.rails</string>
-	<key>tabTrigger</key>
-	<string>artnp</string>
-	<key>uuid</key>
-	<string>97021C0D-EB65-4046-B688-01F09B3B1615</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/assert_redirected_to (path plural).tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/assert_redirected_to (path plural).tmSnippet
deleted file mode 100644
index 1eb37a6df..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/assert_redirected_to (path plural).tmSnippet	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>assert_redirected_to ${10:${2:model}s_path}</string>
-	<key>name</key>
-	<string>assert_redirected_to (path plural)</string>
-	<key>scope</key>
-	<string>source.ruby.rails</string>
-	<key>tabTrigger</key>
-	<string>artpp</string>
-	<key>uuid</key>
-	<string>0249637E-0720-46DA-A8FD-E176A2CC458B</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/assert_redirected_to (path).tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/assert_redirected_to (path).tmSnippet
deleted file mode 100644
index 7094f29f1..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/assert_redirected_to (path).tmSnippet	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>assert_redirected_to ${2:${12:model}_path(${13:@}${14:${12}})}</string>
-	<key>name</key>
-	<string>assert_redirected_to (path)</string>
-	<key>scope</key>
-	<string>source.ruby.rails</string>
-	<key>tabTrigger</key>
-	<string>artp</string>
-	<key>uuid</key>
-	<string>D33EDCE7-F8AF-48D4-AA7A-852BBF03E31D</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/assert_rjs.tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/assert_rjs.tmSnippet
deleted file mode 100644
index 998b4c39a..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/assert_rjs.tmSnippet
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>assert_rjs :${1:replace}, ${2:"${3:dom id}"}</string>
-	<key>name</key>
-	<string>assert_rjs</string>
-	<key>scope</key>
-	<string>source.ruby.rails</string>
-	<key>tabTrigger</key>
-	<string>asrj</string>
-	<key>uuid</key>
-	<string>E0F281EC-5311-41F8-ADD9-2E2D059DA651</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/assert_select.tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/assert_select.tmSnippet
deleted file mode 100644
index 053434dfe..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/assert_select.tmSnippet
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>assert_select '${1:path}'${2:, :${3:text} =&gt; ${4:'${5:inner_html}'}}${6: do
-	$0
-end}</string>
-	<key>name</key>
-	<string>assert_select</string>
-	<key>scope</key>
-	<string>source.ruby.rails</string>
-	<key>tabTrigger</key>
-	<string>ass</string>
-	<key>uuid</key>
-	<string>DBE14FE8-B415-4DBC-A316-F8DA63FE9FD7</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/before_create.tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/before_create.tmSnippet
deleted file mode 100644
index 32cb0118e..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/before_create.tmSnippet
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>before_create </string>
-	<key>name</key>
-	<string>before_create</string>
-	<key>scope</key>
-	<string>source.ruby.rails</string>
-	<key>tabTrigger</key>
-	<string>befc</string>
-	<key>uuid</key>
-	<string>D64D8863-DCB6-4397-B5B0-073E0AE04167</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/before_destroy.tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/before_destroy.tmSnippet
deleted file mode 100644
index 1c1769a7c..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/before_destroy.tmSnippet
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>before_destroy </string>
-	<key>name</key>
-	<string>before_destroy</string>
-	<key>scope</key>
-	<string>source.ruby.rails</string>
-	<key>tabTrigger</key>
-	<string>befd</string>
-	<key>uuid</key>
-	<string>3F4B502B-5F68-4687-88E9-6EF3BDF9677D</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/before_save.tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/before_save.tmSnippet
deleted file mode 100644
index a0be84a75..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/before_save.tmSnippet
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>before_save </string>
-	<key>name</key>
-	<string>before_save</string>
-	<key>scope</key>
-	<string>source.ruby.rails</string>
-	<key>tabTrigger</key>
-	<string>befs</string>
-	<key>uuid</key>
-	<string>523BE8A6-0845-493D-A9B6-532F73D21950</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/before_update.tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/before_update.tmSnippet
deleted file mode 100644
index e44a4c50a..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/before_update.tmSnippet
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>before_update </string>
-	<key>name</key>
-	<string>before_update</string>
-	<key>scope</key>
-	<string>source.ruby.rails</string>
-	<key>tabTrigger</key>
-	<string>befu</string>
-	<key>uuid</key>
-	<string>1C20EEBE-B4BA-48C8-9B33-7B5BB00D958C</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/before_validation.tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/before_validation.tmSnippet
deleted file mode 100644
index 44c18afe7..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/before_validation.tmSnippet
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>before_validation </string>
-	<key>name</key>
-	<string>before_validation</string>
-	<key>scope</key>
-	<string>source.ruby.rails</string>
-	<key>tabTrigger</key>
-	<string>befv</string>
-	<key>uuid</key>
-	<string>A1776279-5396-4FE9-9218-8BF2C88C5271</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/before_validation_on_create.tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/before_validation_on_create.tmSnippet
deleted file mode 100644
index 32fb67107..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/before_validation_on_create.tmSnippet
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>before_validation_on_create </string>
-	<key>name</key>
-	<string>before_validation_on_create</string>
-	<key>scope</key>
-	<string>source.ruby.rails</string>
-	<key>tabTrigger</key>
-	<string>befvoc</string>
-	<key>uuid</key>
-	<string>E2CE2E3B-8A61-4866-9AF5-A12F44CF7233</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/before_validation_on_update.tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/before_validation_on_update.tmSnippet
deleted file mode 100644
index 9f384da43..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/before_validation_on_update.tmSnippet
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>before_validation_on_update</string>
-	<key>name</key>
-	<string>before_validation_on_update</string>
-	<key>scope</key>
-	<string>source.ruby.rails</string>
-	<key>tabTrigger</key>
-	<string>befvou</string>
-	<key>uuid</key>
-	<string>86CFB156-E72B-440F-9C7D-08A3375C3ADB</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/belongs_to (bt).plist b/bundles/ruby-on-rails.tmbundle/Snippets/belongs_to (bt).plist
deleted file mode 100644
index fe00c1b7b..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/belongs_to (bt).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>belongs_to :${1:object}${2:, :class_name =&gt; "${3:${1/[[:alpha:]]+|(_)/(?1::\u$0)/g}}", :foreign_key =&gt; "${4:${1}_id}"}</string>
-	<key>name</key>
-	<string>belongs_to</string>
-	<key>scope</key>
-	<string>source.ruby.rails</string>
-	<key>tabTrigger</key>
-	<string>bt</string>
-	<key>uuid</key>
-	<string>B8F08BD7-6160-482C-8A3D-CBC6BD2079A4</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/cattr_accessor.tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/cattr_accessor.tmSnippet
deleted file mode 100644
index 80ba8f98c..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/cattr_accessor.tmSnippet
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>cattr_accessor :${0:attr_names}</string>
-	<key>name</key>
-	<string>cattr_accessor</string>
-	<key>scope</key>
-	<string>source.ruby.rails</string>
-	<key>tabTrigger</key>
-	<string>crw</string>
-	<key>uuid</key>
-	<string>F57522B2-9F5F-4DF9-AE46-9478AF019C63</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/def create - resource.tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/def create - resource.tmSnippet
deleted file mode 100644
index d608ed3ae..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/def create - resource.tmSnippet	
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>def create
-	@${1:model} = ${2:${1/[[:alpha:]]+|(_)/(?1::\u$0)/g}}.new(params[:$1])
-	$0
-	respond_to do |wants|
-		if @$1.save
-			flash[:notice] = '$2 was successfully created.'
-			wants.html { redirect_to(@$1) }
-			wants.xml { render :xml =&gt; @$1, :status =&gt; :created, :location =&gt; @$1 }
-		else
-			wants.html { render :action =&gt; "new" }
-			wants.xml { render :xml =&gt; @$1.errors, :status =&gt; :unprocessable_entity }
-		end
-	end
-end
-</string>
-	<key>name</key>
-	<string>def create - resource</string>
-	<key>scope</key>
-	<string>meta.rails.controller</string>
-	<key>tabTrigger</key>
-	<string>defcreate</string>
-	<key>uuid</key>
-	<string>54F61419-001F-4B71-83AC-8DC633694AF0</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/def get request.tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/def get request.tmSnippet
deleted file mode 100644
index 6da35a463..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/def get request.tmSnippet	
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>def test_should_get_${1:action}
-	${2:@${3:model} = ${4:$3s}(:${5:fixture_name})
-	}get :${1}${6:, :id =&gt; @$3.to_param}
-	assert_response :success
-	$0
-end</string>
-	<key>name</key>
-	<string>def test_should_get_action</string>
-	<key>scope</key>
-	<string>meta.rails.functional_test</string>
-	<key>tabTrigger</key>
-	<string>deftg</string>
-	<key>uuid</key>
-	<string>1C491A76-751F-44EF-8DFB-0A585C7EEFF6</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/def post request.tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/def post request.tmSnippet
deleted file mode 100644
index bfaf1af0c..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/def post request.tmSnippet	
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>def test_should_post_${1:action}
-	${3:@$2 = ${4:$2s}(:${5:fixture_name})
-	}post :${1}${6:, :id =&gt; @$2.to_param}, :${2:model} =&gt; { $0 }
-	assert_response :redirect
-
-end</string>
-	<key>name</key>
-	<string>def test_should_post_action</string>
-	<key>scope</key>
-	<string>meta.rails.functional_test</string>
-	<key>tabTrigger</key>
-	<string>deftp</string>
-	<key>uuid</key>
-	<string>8B9CD068-4338-4039-AA06-D839A6C7A9FF</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/end.tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/end.tmSnippet
deleted file mode 100644
index 7d4f6f908..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/end.tmSnippet
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>&lt;% end -%&gt;</string>
-	<key>name</key>
-	<string>end (ERB)</string>
-	<key>scope</key>
-	<string>text.html.ruby</string>
-	<key>tabTrigger</key>
-	<string>end</string>
-	<key>uuid</key>
-	<string>AC385ABF-96CD-4FCB-80AD-BF37D6EE79D2</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/find(%3Aall).tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/find(%3Aall).tmSnippet
deleted file mode 100644
index 877330cd6..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/find(%3Aall).tmSnippet
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>find(:all${1:, :conditions =&gt; ['${2:${3:field} = ?}', ${5:true}]})</string>
-	<key>name</key>
-	<string>find(:all)</string>
-	<key>scope</key>
-	<string>source.ruby.rails</string>
-	<key>tabTrigger</key>
-	<string>fina</string>
-	<key>uuid</key>
-	<string>A017AB39-A875-40DC-8ACF-7E3551057CA0</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/find(%3Afirst).tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/find(%3Afirst).tmSnippet
deleted file mode 100644
index 3bf5c483b..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/find(%3Afirst).tmSnippet
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>find(:first${1:, :conditions =&gt; ['${2:${3:field} = ?}', ${5:true}]})</string>
-	<key>name</key>
-	<string>find(:first)</string>
-	<key>scope</key>
-	<string>source.ruby.rails</string>
-	<key>tabTrigger</key>
-	<string>finf</string>
-	<key>uuid</key>
-	<string>FE430ECD-5D40-4D95-A73B-F064C73992DE</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/find(id).tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/find(id).tmSnippet
deleted file mode 100644
index 9719cbd39..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/find(id).tmSnippet
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>find(${1:id})</string>
-	<key>name</key>
-	<string>find(id)</string>
-	<key>scope</key>
-	<string>source.ruby.rails</string>
-	<key>tabTrigger</key>
-	<string>fini</string>
-	<key>uuid</key>
-	<string>59CD3A41-8164-4FB4-B462-D7ACE86BCDBF</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/for loop erb.tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/for loop erb.tmSnippet
deleted file mode 100644
index 8fcdd1fd7..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/for loop erb.tmSnippet	
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>&lt;% if !${1:list}.blank? %&gt;
-  &lt;% for ${2:item} in ${1} %&gt;
-    $3
-  &lt;% end %&gt;
-&lt;% else %&gt;
-  $4
-&lt;% end %&gt;
-</string>
-	<key>name</key>
-	<string>for loop in rhtml</string>
-	<key>scope</key>
-	<string>text.html.ruby</string>
-	<key>tabTrigger</key>
-	<string>for</string>
-	<key>uuid</key>
-	<string>F7744F07-306C-4951-AB5A-3D69BA5516B7</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/form_for check_box.tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/form_for check_box.tmSnippet
deleted file mode 100644
index 7de811baa..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/form_for check_box.tmSnippet	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>${TM_RAILS_TEMPLATE_START_RUBY_EXPR}f.check_box :${1:attribute}${TM_RAILS_TEMPLATE_END_RUBY_EXPR}</string>
-	<key>name</key>
-	<string>form_for check_box</string>
-	<key>scope</key>
-	<string>text.html.ruby, text.haml</string>
-	<key>tabTrigger</key>
-	<string>ffcb</string>
-	<key>uuid</key>
-	<string>F0DB6886-4FFE-45BA-907F-44326AD8142D</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/form_for checkbox.tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/form_for checkbox.tmSnippet
deleted file mode 100644
index c10e72a3d..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/form_for checkbox.tmSnippet	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>${TM_RAILS_TEMPLATE_START_RUBY_EXPR}f.check_box :${1:attribute}${TM_RAILS_TEMPLATE_END_RUBY_EXPR}</string>
-	<key>name</key>
-	<string>f.check_box (ffcb)</string>
-	<key>scope</key>
-	<string>text.html.ruby, text.haml</string>
-	<key>tabTrigger</key>
-	<string>f.</string>
-	<key>uuid</key>
-	<string>F579F9E7-E072-4BCC-BFF9-C8C5BAE7FFA5</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/form_for file_field 2.tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/form_for file_field 2.tmSnippet
deleted file mode 100644
index 845f0c713..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/form_for file_field 2.tmSnippet	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>${TM_RAILS_TEMPLATE_START_RUBY_EXPR}f.file_field :${1:attribute}${TM_RAILS_TEMPLATE_END_RUBY_EXPR}</string>
-	<key>name</key>
-	<string>form_for file_field</string>
-	<key>scope</key>
-	<string>text.html.ruby, text.haml</string>
-	<key>tabTrigger</key>
-	<string>ffff</string>
-	<key>uuid</key>
-	<string>C8BA285D-E12E-4AB8-A941-514C963E8226</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/form_for file_field.tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/form_for file_field.tmSnippet
deleted file mode 100644
index 5f74f9ab5..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/form_for file_field.tmSnippet	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>${TM_RAILS_TEMPLATE_START_RUBY_EXPR}f.file_field :${1:attribute}${TM_RAILS_TEMPLATE_END_RUBY_EXPR}</string>
-	<key>name</key>
-	<string>f.file_field (ffff)</string>
-	<key>scope</key>
-	<string>text.html.ruby, text.haml</string>
-	<key>tabTrigger</key>
-	<string>f.</string>
-	<key>uuid</key>
-	<string>79BC2303-3D9D-4E21-AF85-73B388B7B56D</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/form_for hidden_field 2.tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/form_for hidden_field 2.tmSnippet
deleted file mode 100644
index f02c3e1c2..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/form_for hidden_field 2.tmSnippet	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>${TM_RAILS_TEMPLATE_START_RUBY_EXPR}f.hidden_field :${1:attribute}${TM_RAILS_TEMPLATE_END_RUBY_EXPR}</string>
-	<key>name</key>
-	<string>form_for hidden_field</string>
-	<key>scope</key>
-	<string>text.html.ruby, text.haml</string>
-	<key>tabTrigger</key>
-	<string>ffhf</string>
-	<key>uuid</key>
-	<string>99FEFD9B-5A07-46E3-950D-5C474E42B695</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/form_for hidden_field.tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/form_for hidden_field.tmSnippet
deleted file mode 100644
index ed8136a8c..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/form_for hidden_field.tmSnippet	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>${TM_RAILS_TEMPLATE_START_RUBY_EXPR}f.hidden_field :${1:attribute}${TM_RAILS_TEMPLATE_END_RUBY_EXPR}</string>
-	<key>name</key>
-	<string>f.hidden_field (ffhf)</string>
-	<key>scope</key>
-	<string>text.html.ruby, text.haml</string>
-	<key>tabTrigger</key>
-	<string>f.</string>
-	<key>uuid</key>
-	<string>5DBA8F72-DD6C-4CBF-83FD-76301E159BA9</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/form_for label 2.tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/form_for label 2.tmSnippet
deleted file mode 100644
index 38a7eb97a..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/form_for label 2.tmSnippet	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>${TM_RAILS_TEMPLATE_START_RUBY_EXPR}f.label :${1:attribute}${2:, "${3:${1/[[:alpha:]]+|(_)/(?1: :\u$0)/g}}"}${TM_RAILS_TEMPLATE_END_RUBY_EXPR}</string>
-	<key>name</key>
-	<string>form_for label</string>
-	<key>scope</key>
-	<string>text.html.ruby, text.haml</string>
-	<key>tabTrigger</key>
-	<string>ffl</string>
-	<key>uuid</key>
-	<string>B31822D9-2048-4D16-B2AF-00E0B4E5C368</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/form_for label.tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/form_for label.tmSnippet
deleted file mode 100644
index 96d17eb29..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/form_for label.tmSnippet	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>${TM_RAILS_TEMPLATE_START_RUBY_EXPR}f.label :${1:attribute}${2:, "${3:${1/[[:alpha:]]+|(_)/(?1: :\u$0)/g}}"}${TM_RAILS_TEMPLATE_END_RUBY_EXPR}</string>
-	<key>name</key>
-	<string>f.label (ffl)</string>
-	<key>scope</key>
-	<string>text.html.ruby, text.haml</string>
-	<key>tabTrigger</key>
-	<string>f.</string>
-	<key>uuid</key>
-	<string>402C251E-595B-4A58-8EB9-41989040F280</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/form_for password_field 2.tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/form_for password_field 2.tmSnippet
deleted file mode 100644
index 94c30b651..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/form_for password_field 2.tmSnippet	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>${TM_RAILS_TEMPLATE_START_RUBY_EXPR}f.password_field :${1:attribute}${TM_RAILS_TEMPLATE_END_RUBY_EXPR}</string>
-	<key>name</key>
-	<string>form_for password_field</string>
-	<key>scope</key>
-	<string>text.html.ruby, text.haml</string>
-	<key>tabTrigger</key>
-	<string>ffpf</string>
-	<key>uuid</key>
-	<string>3379FB35-C664-4255-96C6-6E4B91F12759</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/form_for password_field.tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/form_for password_field.tmSnippet
deleted file mode 100644
index 0b143c956..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/form_for password_field.tmSnippet	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>${TM_RAILS_TEMPLATE_START_RUBY_EXPR}f.password_field :${1:attribute}${TM_RAILS_TEMPLATE_END_RUBY_EXPR}</string>
-	<key>name</key>
-	<string>f.password_field (ffpf)</string>
-	<key>scope</key>
-	<string>text.html.ruby, text.haml</string>
-	<key>tabTrigger</key>
-	<string>f.</string>
-	<key>uuid</key>
-	<string>42289456-C8D1-498C-AE30-5206544B349F</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/form_for radio_box 2.tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/form_for radio_box 2.tmSnippet
deleted file mode 100644
index 383776b09..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/form_for radio_box 2.tmSnippet	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>${TM_RAILS_TEMPLATE_START_RUBY_EXPR}f.radio_box :${1:attribute}, :${2:tag_value}${TM_RAILS_TEMPLATE_END_RUBY_EXPR}</string>
-	<key>name</key>
-	<string>form_for radio_box</string>
-	<key>scope</key>
-	<string>text.html.ruby, text.haml</string>
-	<key>tabTrigger</key>
-	<string>ffrb</string>
-	<key>uuid</key>
-	<string>D4282CE1-4171-4B13-9220-3F2718BC2505</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/form_for radio_box.tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/form_for radio_box.tmSnippet
deleted file mode 100644
index 19a1a3769..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/form_for radio_box.tmSnippet	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>${TM_RAILS_TEMPLATE_START_RUBY_EXPR}f.radio_box :${1:attribute}, :${2:tag_value}${TM_RAILS_TEMPLATE_END_RUBY_EXPR}</string>
-	<key>name</key>
-	<string>f.radio_box (ffrb)</string>
-	<key>scope</key>
-	<string>text.html.ruby, text.haml</string>
-	<key>tabTrigger</key>
-	<string>f.</string>
-	<key>uuid</key>
-	<string>A95358D2-C68A-4894-8C36-062C9F45848A</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/form_for submit 2.tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/form_for submit 2.tmSnippet
deleted file mode 100644
index 115b56d1a..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/form_for submit 2.tmSnippet	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>${TM_RAILS_TEMPLATE_START_RUBY_EXPR}f.submit "${1:Submit}"${2:, :disable_with =&gt; '${3:$1ing...}'}${TM_RAILS_TEMPLATE_END_RUBY_EXPR}</string>
-	<key>name</key>
-	<string>form_for submit</string>
-	<key>scope</key>
-	<string>text.html.ruby, text.haml</string>
-	<key>tabTrigger</key>
-	<string>ffs</string>
-	<key>uuid</key>
-	<string>3000E569-4E19-4566-B08E-A3FFFAAC9075</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/form_for submit.tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/form_for submit.tmSnippet
deleted file mode 100644
index 8d3ba11e4..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/form_for submit.tmSnippet	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>${TM_RAILS_TEMPLATE_START_RUBY_EXPR}f.submit "${1:Submit}"${2:, :disable_with =&gt; '${3:$1ing...}'}${TM_RAILS_TEMPLATE_END_RUBY_EXPR}</string>
-	<key>name</key>
-	<string>f.submit (ffs)</string>
-	<key>scope</key>
-	<string>text.html.ruby, text.haml</string>
-	<key>tabTrigger</key>
-	<string>f.</string>
-	<key>uuid</key>
-	<string>C315EC5D-A7F3-49CB-9795-21B78BB42FF4</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/form_for text_area 2.tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/form_for text_area 2.tmSnippet
deleted file mode 100644
index 1169dbd76..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/form_for text_area 2.tmSnippet	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>${TM_RAILS_TEMPLATE_START_RUBY_EXPR}f.text_area :${1:attribute}${TM_RAILS_TEMPLATE_END_RUBY_EXPR}</string>
-	<key>name</key>
-	<string>form_for text_area</string>
-	<key>scope</key>
-	<string>text.html.ruby, text.haml</string>
-	<key>tabTrigger</key>
-	<string>ffta</string>
-	<key>uuid</key>
-	<string>4C898FA8-D09C-4B28-BE42-14BB4EA4E2B1</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/form_for text_area.tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/form_for text_area.tmSnippet
deleted file mode 100644
index 74a4b06fa..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/form_for text_area.tmSnippet	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>${TM_RAILS_TEMPLATE_START_RUBY_EXPR}f.text_area :${1:attribute}${TM_RAILS_TEMPLATE_END_RUBY_EXPR}</string>
-	<key>name</key>
-	<string>f.text_area (ffta)</string>
-	<key>scope</key>
-	<string>text.html.ruby, text.haml</string>
-	<key>tabTrigger</key>
-	<string>f.</string>
-	<key>uuid</key>
-	<string>06498926-F84D-466C-8736-B8A0AC586A94</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/form_for text_field 2.tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/form_for text_field 2.tmSnippet
deleted file mode 100644
index 1d8643bea..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/form_for text_field 2.tmSnippet	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>${TM_RAILS_TEMPLATE_START_RUBY_EXPR}f.text_field :${1:attribute}${TM_RAILS_TEMPLATE_END_RUBY_EXPR}</string>
-	<key>name</key>
-	<string>form_for text_field</string>
-	<key>scope</key>
-	<string>text.html.ruby, text.haml</string>
-	<key>tabTrigger</key>
-	<string>fftf</string>
-	<key>uuid</key>
-	<string>F46EE8EE-239C-46D7-980B-3F861B7D9111</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/form_for text_field.tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/form_for text_field.tmSnippet
deleted file mode 100644
index 5d97b057f..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/form_for text_field.tmSnippet	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>${TM_RAILS_TEMPLATE_START_RUBY_EXPR}f.text_field :${1:attribute}${TM_RAILS_TEMPLATE_END_RUBY_EXPR}</string>
-	<key>name</key>
-	<string>f.text_field (fftf)</string>
-	<key>scope</key>
-	<string>text.html.ruby, text.haml</string>
-	<key>tabTrigger</key>
-	<string>f.</string>
-	<key>uuid</key>
-	<string>CC1BCD1C-2479-4335-B511-17B880316A75</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/form_for with errors.tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/form_for with errors.tmSnippet
deleted file mode 100644
index 45d2a624b..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/form_for with errors.tmSnippet	
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>${TM_RAILS_TEMPLATE_START_RUBY_EXPR}error_messages_for :${1:model}${TM_RAILS_TEMPLATE_END_RUBY_EXPR}
-
-${TM_RAILS_TEMPLATE_START_RUBY_INLINE}form_for @${2:$1} do |f|${TM_RAILS_TEMPLATE_END_RUBY_INLINE}
-  $0
-${TM_RAILS_TEMPLATE_END_RUBY_BLOCK}</string>
-	<key>name</key>
-	<string>form_for with errors</string>
-	<key>scope</key>
-	<string>text.html.ruby, text.haml</string>
-	<key>tabTrigger</key>
-	<string>ffe</string>
-	<key>uuid</key>
-	<string>15BDD7B6-5C15-4684-93C7-A05E3D2221AC</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/form_for.tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/form_for.tmSnippet
deleted file mode 100644
index 24f1b0789..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/form_for.tmSnippet
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>${TM_RAILS_TEMPLATE_START_RUBY_INLINE}form_for @${1:model} do |f|${TM_RAILS_TEMPLATE_END_RUBY_INLINE}
-  $0
-${TM_RAILS_TEMPLATE_END_RUBY_BLOCK}</string>
-	<key>name</key>
-	<string>form_for</string>
-	<key>scope</key>
-	<string>text.html.ruby, text.haml</string>
-	<key>tabTrigger</key>
-	<string>ff</string>
-	<key>uuid</key>
-	<string>7D99041D-C3B7-4940-AE64-6B1758CDB47C</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/has_and_belongs_to_many (habtm).plist b/bundles/ruby-on-rails.tmbundle/Snippets/has_and_belongs_to_many (habtm).plist
deleted file mode 100644
index 15eab69f4..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/has_and_belongs_to_many (habtm).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>has_and_belongs_to_many :${1:object}${2:, :join_table =&gt; "${3:table_name}", :foreign_key =&gt; "${4:${1}_id}"}</string>
-	<key>name</key>
-	<string>has_and_belongs_to_many</string>
-	<key>scope</key>
-	<string>source.ruby.rails</string>
-	<key>tabTrigger</key>
-	<string>habtm</string>
-	<key>uuid</key>
-	<string>2AC3AC1F-743B-4A33-863C-C37885073806</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/has_many (hm).plist b/bundles/ruby-on-rails.tmbundle/Snippets/has_many (hm).plist
deleted file mode 100644
index d782dc2fc..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/has_many (hm).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>has_many :${1:object}s${2:, :class_name =&gt; "${1}", :foreign_key =&gt; "${4:reference}_id"}</string>
-	<key>name</key>
-	<string>has_many</string>
-	<key>scope</key>
-	<string>source.ruby.rails</string>
-	<key>tabTrigger</key>
-	<string>hm</string>
-	<key>uuid</key>
-	<string>F396B7BD-8255-48B1-904A-06E7D7CC2741</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/has_many (through).tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/has_many (through).tmSnippet
deleted file mode 100644
index 709246fe9..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/has_many (through).tmSnippet	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>has_many :${1:objects}, :through =&gt; :${2:join_association}${3:, :source =&gt; :${4:${2}_table_foreign_key_to_${1}_table}}</string>
-	<key>name</key>
-	<string>has_many (through)</string>
-	<key>scope</key>
-	<string>source.ruby.rails</string>
-	<key>tabTrigger</key>
-	<string>hmt</string>
-	<key>uuid</key>
-	<string>9D58B6C9-BA52-48B3-B639-D5CB894AF810</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/has_many :dependent => :destroy.tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/has_many :dependent => :destroy.tmSnippet
deleted file mode 100644
index d4b0b8470..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/has_many :dependent => :destroy.tmSnippet	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>has_many :${1:object}s${2:, :class_name =&gt; "${1}", :foreign_key =&gt; "${4:reference}_id"}, :dependent =&gt; :destroy$0</string>
-	<key>name</key>
-	<string>has_many :dependent =&gt; :destroy</string>
-	<key>scope</key>
-	<string>source.ruby.rails</string>
-	<key>tabTrigger</key>
-	<string>hmd</string>
-	<key>uuid</key>
-	<string>3E3AF538-171B-4108-AB92-827AD7E24C77</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/has_one (ho).plist b/bundles/ruby-on-rails.tmbundle/Snippets/has_one (ho).plist
deleted file mode 100644
index 50e153bbc..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/has_one (ho).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>has_one :${1:object}${2:, :class_name =&gt; "${3:${1/[[:alpha:]]+|(_)/(?1::\u$0)/g}}", :foreign_key =&gt; "${4:${1}_id}"}</string>
-	<key>name</key>
-	<string>has_one</string>
-	<key>scope</key>
-	<string>source.ruby.rails</string>
-	<key>tabTrigger</key>
-	<string>ho</string>
-	<key>uuid</key>
-	<string>BD2E4045-54E6-450E-B31B-5E1865CFFBC9</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/image_submit_tag.tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/image_submit_tag.tmSnippet
deleted file mode 100644
index 7bf4aebb7..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/image_submit_tag.tmSnippet
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>${TM_RAILS_TEMPLATE_START_RUBY_EXPR}image_submit_tag("${1:agree.png}"${2:${3:, :id =&gt; "${4:${1/^(\w+)(\.\w*)?$/$1/}}"}${5:, :name =&gt; "${6:${1/^(\w+)(\.\w*)?$/$1/}}"}${7:, :class =&gt; "${8:${1/^(\w+)(\.\w*)?$/$1/}-button}"}${9:, :disabled =&gt; ${10:false}}})${TM_RAILS_TEMPLATE_END_RUBY_EXPR}</string>
-	<key>name</key>
-	<string>image_submit_tag</string>
-	<key>scope</key>
-	<string>text.html.ruby, text.haml</string>
-	<key>tabTrigger</key>
-	<string>ist</string>
-	<key>uuid</key>
-	<string>9FB9848E-EA5A-11DC-9DE5-00112475D960</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/javascript_include_tag.tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/javascript_include_tag.tmSnippet
deleted file mode 100644
index 8fccf0e4b..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/javascript_include_tag.tmSnippet
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>${TM_RAILS_TEMPLATE_START_RUBY_EXPR}javascript_include_tag ${1::all}${2:, :cache =&gt; ${3:true}}${TM_RAILS_TEMPLATE_END_RUBY_EXPR}</string>
-	<key>name</key>
-	<string>javascript_include_tag</string>
-	<key>scope</key>
-	<string>text.html.ruby</string>
-	<key>tabTrigger</key>
-	<string>jit</string>
-	<key>uuid</key>
-	<string>FEF49C86-9386-405E-A191-684D1C963E3A</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/lia.plist b/bundles/ruby-on-rails.tmbundle/Snippets/lia.plist
deleted file mode 100644
index d37084585..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/lia.plist
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>${TM_RAILS_TEMPLATE_START_RUBY_EXPR}link_to "${1:link text...}", :action =&gt; "${2:index}"${TM_RAILS_TEMPLATE_END_RUBY_EXPR}</string>
-	<key>name</key>
-	<string>link_to (action)</string>
-	<key>scope</key>
-	<string>text.html.ruby, text.haml</string>
-	<key>tabTrigger</key>
-	<string>lia</string>
-	<key>uuid</key>
-	<string>9E2B42FE-7BC8-11D9-906A-000D932CD5BA</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/liai.plist b/bundles/ruby-on-rails.tmbundle/Snippets/liai.plist
deleted file mode 100644
index 810a76b36..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/liai.plist
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>${TM_RAILS_TEMPLATE_START_RUBY_EXPR}link_to "${1:link text...}", :action =&gt; "${2:edit}", :id =&gt; ${3:@item}${TM_RAILS_TEMPLATE_END_RUBY_EXPR}</string>
-	<key>name</key>
-	<string>link_to (action, id)</string>
-	<key>scope</key>
-	<string>text.html.ruby, text.haml</string>
-	<key>tabTrigger</key>
-	<string>liai</string>
-	<key>uuid</key>
-	<string>B4F952F4-7BC8-11D9-906A-000D932CD5BA</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/lic.plist b/bundles/ruby-on-rails.tmbundle/Snippets/lic.plist
deleted file mode 100644
index 053a24975..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/lic.plist
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>${TM_RAILS_TEMPLATE_START_RUBY_EXPR}link_to "${1:link text...}", :controller =&gt; "${2:items}"${TM_RAILS_TEMPLATE_END_RUBY_EXPR}</string>
-	<key>name</key>
-	<string>link_to (controller)</string>
-	<key>scope</key>
-	<string>text.html.ruby, text.haml</string>
-	<key>tabTrigger</key>
-	<string>lic</string>
-	<key>uuid</key>
-	<string>74590E16-7BCB-11D9-906A-000D932CD5BA</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/lica.plist b/bundles/ruby-on-rails.tmbundle/Snippets/lica.plist
deleted file mode 100644
index 6f72cd678..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/lica.plist
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>${TM_RAILS_TEMPLATE_START_RUBY_EXPR}link_to "${1:link text...}", :controller =&gt; "${2:items}", :action =&gt; "${3:index}"${TM_RAILS_TEMPLATE_END_RUBY_EXPR}</string>
-	<key>name</key>
-	<string>link_to (controller, action)</string>
-	<key>scope</key>
-	<string>text.html.ruby, text.haml</string>
-	<key>tabTrigger</key>
-	<string>lica</string>
-	<key>uuid</key>
-	<string>C11C0BF5-7BC8-11D9-906A-000D932CD5BA</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/licai.plist b/bundles/ruby-on-rails.tmbundle/Snippets/licai.plist
deleted file mode 100644
index 440fc5ca9..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/licai.plist
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>${TM_RAILS_TEMPLATE_START_RUBY_EXPR}link_to "${1:link text...}", :controller =&gt; "${2:items}", :action =&gt; "${3:edit}", :id =&gt; ${4:@item}${TM_RAILS_TEMPLATE_END_RUBY_EXPR}</string>
-	<key>name</key>
-	<string>link_to (controller, action, id)</string>
-	<key>scope</key>
-	<string>text.html.ruby, text.haml</string>
-	<key>tabTrigger</key>
-	<string>licai</string>
-	<key>uuid</key>
-	<string>D21BE958-7BC8-11D9-906A-000D932CD5BA</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/link_to (nested path plural).tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/link_to (nested path plural).tmSnippet
deleted file mode 100644
index 7d0e59517..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/link_to (nested path plural).tmSnippet	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>${TM_RAILS_TEMPLATE_START_RUBY_EXPR}link_to ${1:"${2:link text...}"}, ${3:${10:parent}_${11:child}_path(${12:@}${13:${10}})}${TM_RAILS_TEMPLATE_END_RUBY_EXPR}</string>
-	<key>name</key>
-	<string>link_to (nested path plural)</string>
-	<key>scope</key>
-	<string>text.html.ruby, text.haml</string>
-	<key>tabTrigger</key>
-	<string>linpp</string>
-	<key>uuid</key>
-	<string>866AAD87-E458-4F2D-9E7C-3CE73EFC047B</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/link_to (nested path).tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/link_to (nested path).tmSnippet
deleted file mode 100644
index 19a0ca5d4..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/link_to (nested path).tmSnippet	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>${TM_RAILS_TEMPLATE_START_RUBY_EXPR}link_to ${1:"${2:link text...}"}, ${3:${12:parent}_${13:child}_path(${14:@}${15:${12}}, ${16:@}${17:${13}})}${TM_RAILS_TEMPLATE_END_RUBY_EXPR}</string>
-	<key>name</key>
-	<string>link_to (nested path)</string>
-	<key>scope</key>
-	<string>text.html.ruby, text.haml</string>
-	<key>tabTrigger</key>
-	<string>linp</string>
-	<key>uuid</key>
-	<string>750DEEF9-18A0-40FC-8E54-574CE5EE5565</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/link_to (path plural).tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/link_to (path plural).tmSnippet
deleted file mode 100644
index c51b8d8b2..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/link_to (path plural).tmSnippet	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>${TM_RAILS_TEMPLATE_START_RUBY_EXPR}link_to ${1:"${2:link text...}"}, ${3:${4:model}s_path}${TM_RAILS_TEMPLATE_END_RUBY_EXPR}</string>
-	<key>name</key>
-	<string>link_to (path plural)</string>
-	<key>scope</key>
-	<string>text.html.ruby, text.haml</string>
-	<key>tabTrigger</key>
-	<string>lipp</string>
-	<key>uuid</key>
-	<string>6BA737F0-63D1-4D82-9381-4331E18B12C5</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/link_to (path).tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/link_to (path).tmSnippet
deleted file mode 100644
index fbb80ef82..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/link_to (path).tmSnippet	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>${TM_RAILS_TEMPLATE_START_RUBY_EXPR}link_to ${1:"${2:link text...}"}, ${3:${12:model}_path(${13:@}${14:${12}})}${TM_RAILS_TEMPLATE_END_RUBY_EXPR}</string>
-	<key>name</key>
-	<string>link_to (path)</string>
-	<key>scope</key>
-	<string>text.html.ruby, text.haml</string>
-	<key>tabTrigger</key>
-	<string>lip</string>
-	<key>uuid</key>
-	<string>326B57A7-B4A9-447B-A3D2-0EA74158E1E1</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/link_to model.tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/link_to model.tmSnippet
deleted file mode 100644
index ccd67294b..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/link_to model.tmSnippet	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>${TM_RAILS_TEMPLATE_START_RUBY_EXPR}link_to ${1:model}.${2:name}, ${3:${4:$1}_path(${14:$1})}${TM_RAILS_TEMPLATE_END_RUBY_EXPR}</string>
-	<key>name</key>
-	<string>link_to model</string>
-	<key>scope</key>
-	<string>text.html.ruby, text.haml</string>
-	<key>tabTrigger</key>
-	<string>lim</string>
-	<key>uuid</key>
-	<string>E5E08AA0-4EDD-4583-BF07-5D6C49E98410</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/logger_debug.tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/logger_debug.tmSnippet
deleted file mode 100644
index 2e76fe07f..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/logger_debug.tmSnippet
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>logger.debug { "${1:message}" }$0</string>
-	<key>name</key>
-	<string>logger.debug</string>
-	<key>scope</key>
-	<string>source.ruby.rails</string>
-	<key>tabTrigger</key>
-	<string>logd</string>
-	<key>uuid</key>
-	<string>D975E5C1-42C2-40F1-8960-0DA533B18113</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/logger_error.tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/logger_error.tmSnippet
deleted file mode 100644
index 7f88e74f0..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/logger_error.tmSnippet
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>logger.error { "${1:message}" }$0</string>
-	<key>name</key>
-	<string>logger.error</string>
-	<key>scope</key>
-	<string>source.ruby.rails</string>
-	<key>tabTrigger</key>
-	<string>loge</string>
-	<key>uuid</key>
-	<string>7053B86A-9B81-4154-AB3C-61B8035C5D33</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/logger_fatal.tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/logger_fatal.tmSnippet
deleted file mode 100644
index c5dd89fbd..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/logger_fatal.tmSnippet
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>logger.fatal { "${1:message}" }$0</string>
-	<key>name</key>
-	<string>logger.fatal</string>
-	<key>scope</key>
-	<string>source.ruby.rails</string>
-	<key>tabTrigger</key>
-	<string>logf</string>
-	<key>uuid</key>
-	<string>35E95C81-22F7-4C40-8297-ED21086DDA81</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/logger_info.tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/logger_info.tmSnippet
deleted file mode 100644
index 7f6949d68..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/logger_info.tmSnippet
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>logger.info { "${1:message}" }$0</string>
-	<key>name</key>
-	<string>logger.info</string>
-	<key>scope</key>
-	<string>source.ruby.rails</string>
-	<key>tabTrigger</key>
-	<string>logi</string>
-	<key>uuid</key>
-	<string>36E2A3EE-E9CC-4B7F-A4CF-AFAF970B8699</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/logger_warn.tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/logger_warn.tmSnippet
deleted file mode 100644
index e3a5357ed..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/logger_warn.tmSnippet
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>logger.warn { "${1:message}" }$0</string>
-	<key>name</key>
-	<string>logger.warn</string>
-	<key>scope</key>
-	<string>source.ruby.rails</string>
-	<key>tabTrigger</key>
-	<string>logw</string>
-	<key>uuid</key>
-	<string>38D5CA05-E219-4399-A244-609AF40B1D0B</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/map(&%3Asym_proc).tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/map(&%3Asym_proc).tmSnippet
deleted file mode 100644
index 4cd94e4e3..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/map(&%3Asym_proc).tmSnippet
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>map(&amp;:${1:id})</string>
-	<key>name</key>
-	<string>map(&amp;:sym_proc)</string>
-	<key>scope</key>
-	<string>source.ruby.rails</string>
-	<key>tabTrigger</key>
-	<string>mp</string>
-	<key>uuid</key>
-	<string>EC605540-C431-4FD0-AD91-D913118DACA7</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/map_catch_all.tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/map_catch_all.tmSnippet
deleted file mode 100644
index 2e925829c..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/map_catch_all.tmSnippet
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>${1:map}.catch_all "*${2:anything}", :controller =&gt; "${3:default}", :action =&gt; "${4:error}"
-</string>
-	<key>name</key>
-	<string>map.catch_all</string>
-	<key>scope</key>
-	<string>meta.rails.routes</string>
-	<key>tabTrigger</key>
-	<string>mapca</string>
-	<key>uuid</key>
-	<string>F3606586-F905-4A91-92CA-82319239221D</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/map_named_route.tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/map_named_route.tmSnippet
deleted file mode 100644
index 334621960..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/map_named_route.tmSnippet
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>${1:map}.${2:connect} '${3::controller/:action/:id}'</string>
-	<key>name</key>
-	<string>map.named_route</string>
-	<key>scope</key>
-	<string>meta.rails.routes</string>
-	<key>tabTrigger</key>
-	<string>map</string>
-	<key>uuid</key>
-	<string>91C543BF-7BD8-4E3A-B493-AE572C5472A0</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/map_resource.tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/map_resource.tmSnippet
deleted file mode 100644
index 82728ad1f..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/map_resource.tmSnippet
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>${1:map}.resource :${2:resource}${10: do |${11:$2}|
-  $0
-end}</string>
-	<key>name</key>
-	<string>map.resource</string>
-	<key>scope</key>
-	<string>meta.rails.routes</string>
-	<key>tabTrigger</key>
-	<string>mapr</string>
-	<key>uuid</key>
-	<string>2183A9A9-17ED-4A4F-ABB6-668EDDD3A6E4</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/map_resources.tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/map_resources.tmSnippet
deleted file mode 100644
index 51920457d..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/map_resources.tmSnippet
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>${1:map}.resources :${2:resource}${10: do |${11:$2}|
-  $0
-end}</string>
-	<key>name</key>
-	<string>map.resources</string>
-	<key>scope</key>
-	<string>meta.rails.routes</string>
-	<key>tabTrigger</key>
-	<string>maprs</string>
-	<key>uuid</key>
-	<string>0FF86C46-0E01-4D03-8232-72CA5BD55706</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/map_with_options.tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/map_with_options.tmSnippet
deleted file mode 100644
index 8e6b11277..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/map_with_options.tmSnippet
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>${1:map}.with_options :${2:controller} =&gt; '${3:thing}' do |${4:$3}|
-	$0
-end
-</string>
-	<key>name</key>
-	<string>map.with_options</string>
-	<key>scope</key>
-	<string>meta.rails.routes</string>
-	<key>tabTrigger</key>
-	<string>mapwo</string>
-	<key>uuid</key>
-	<string>BD4B90F7-2187-4E75-BFFB-77BE67CB8DAE</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/mattr_accessor.tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/mattr_accessor.tmSnippet
deleted file mode 100644
index fcf73879f..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/mattr_accessor.tmSnippet
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>mattr_accessor :${0:attr_names}</string>
-	<key>name</key>
-	<string>mattr_accessor</string>
-	<key>scope</key>
-	<string>source.ruby.rails</string>
-	<key>tabTrigger</key>
-	<string>mrw</string>
-	<key>uuid</key>
-	<string>B25B7560-FACB-4A9E-A226-B71C796BD1F3</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/named_scope lambda.tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/named_scope lambda.tmSnippet
deleted file mode 100644
index bc5329cb8..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/named_scope lambda.tmSnippet	
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>named_scope :name, lambda { |${1:param}| { :conditions =&gt; ${3:['${4:${5:field} = ?}', ${6:$1}]} } }
-</string>
-	<key>name</key>
-	<string>named_scope lambda</string>
-	<key>scope</key>
-	<string>source.ruby.rails</string>
-	<key>tabTrigger</key>
-	<string>ncl</string>
-	<key>uuid</key>
-	<string>4E286CB4-069E-474C-A970-95216FE7DE95</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/named_scope.tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/named_scope.tmSnippet
deleted file mode 100644
index 111f77d1b..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/named_scope.tmSnippet
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>named_scope :name${1:, :joins =&gt; :${2:table}}, :conditions =&gt; ${3:['${4:${5:field} = ?}', ${6:true}]}
-</string>
-	<key>name</key>
-	<string>named_scope</string>
-	<key>scope</key>
-	<string>source.ruby.rails</string>
-	<key>tabTrigger</key>
-	<string>nc</string>
-	<key>uuid</key>
-	<string>1CB65A0D-4FEC-4438-9B4F-8B0BD13FB875</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/page_hide (%2Aids).tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/page_hide (%2Aids).tmSnippet
deleted file mode 100644
index 338cd3862..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/page_hide (%2Aids).tmSnippet	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>page.hide ${1:"${2:id(s)}"}</string>
-	<key>name</key>
-	<string>page.hide (*ids)</string>
-	<key>scope</key>
-	<string>source.ruby.rails.rjs</string>
-	<key>tabTrigger</key>
-	<string>hide</string>
-	<key>uuid</key>
-	<string>390A447F-0FA3-4F01-A10C-4F35675E0A43</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/page_insert_html (position, id, partial).tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/page_insert_html (position, id, partial).tmSnippet
deleted file mode 100644
index fdbd61495..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/page_insert_html (position, id, partial).tmSnippet	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>page.insert_html :${1:top}, ${2:"${3:id}"}, :${4:partial =&gt; "${5:template}"}</string>
-	<key>name</key>
-	<string>page.insert_html (position, id, partial)</string>
-	<key>scope</key>
-	<string>source.ruby.rails.rjs</string>
-	<key>tabTrigger</key>
-	<string>ins</string>
-	<key>uuid</key>
-	<string>62BEA590-F4EF-4001-B661-764EDFB92811</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/page_replace (id, partial).tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/page_replace (id, partial).tmSnippet
deleted file mode 100644
index 856a9fa5a..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/page_replace (id, partial).tmSnippet	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>page.replace ${1:"${2:id}"}, :${3:partial =&gt; "${4:template}"}</string>
-	<key>name</key>
-	<string>page.replace (id, partial)</string>
-	<key>scope</key>
-	<string>source.ruby.rails.rjs</string>
-	<key>tabTrigger</key>
-	<string>rep</string>
-	<key>uuid</key>
-	<string>273E5E76-8D13-4476-9C38-8AF87432CB96</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/page_replace_html (id, partial).tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/page_replace_html (id, partial).tmSnippet
deleted file mode 100644
index a4ec87bef..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/page_replace_html (id, partial).tmSnippet	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>page.replace_html ${1:"${2:id}"}, :${3:partial =&gt; "${4:template}"}</string>
-	<key>name</key>
-	<string>page.replace_html (id, partial)</string>
-	<key>scope</key>
-	<string>source.ruby.rails.rjs</string>
-	<key>tabTrigger</key>
-	<string>reph</string>
-	<key>uuid</key>
-	<string>8B914165-9C66-4FA3-9AD6-1DA41B25F8F1</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/page_show (%2Aids).tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/page_show (%2Aids).tmSnippet
deleted file mode 100644
index 873be2d0c..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/page_show (%2Aids).tmSnippet	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>page.show ${1:"${2:id(s)}"}</string>
-	<key>name</key>
-	<string>page.show (*ids)</string>
-	<key>scope</key>
-	<string>source.ruby.rails.rjs</string>
-	<key>tabTrigger</key>
-	<string>show</string>
-	<key>uuid</key>
-	<string>5ACBF49D-B5A5-495C-89D8-18AA740D9D02</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/page_toggle (%2Aids).tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/page_toggle (%2Aids).tmSnippet
deleted file mode 100644
index d6ae50117..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/page_toggle (%2Aids).tmSnippet	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>page.toggle ${1:"${2:id(s)}"}</string>
-	<key>name</key>
-	<string>page.toggle (*ids)</string>
-	<key>scope</key>
-	<string>source.ruby.rails.rjs</string>
-	<key>tabTrigger</key>
-	<string>tog</string>
-	<key>uuid</key>
-	<string>028DA0A4-B310-4BEF-8643-2A22993C21C7</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/page_visual_effect (effect, id).tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/page_visual_effect (effect, id).tmSnippet
deleted file mode 100644
index 4ca7af504..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/page_visual_effect (effect, id).tmSnippet	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>page.visual_effect :${1:toggle_slide}, ${2:"${3:DOM ID}"}</string>
-	<key>name</key>
-	<string>page.visual_effect (effect, id)</string>
-	<key>scope</key>
-	<string>source.ruby.rails.rjs</string>
-	<key>tabTrigger</key>
-	<string>vis</string>
-	<key>uuid</key>
-	<string>CFDC27A3-58CF-4198-8F93-36360978F0D0</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/rails flash.plist b/bundles/ruby-on-rails.tmbundle/Snippets/rails flash.plist
deleted file mode 100644
index f2ce527b3..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/rails flash.plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>flash[:${1:notice}] = "${2:Successfully created...}"$0</string>
-	<key>name</key>
-	<string>flash[…]</string>
-	<key>scope</key>
-	<string>source.ruby.rails</string>
-	<key>tabTrigger</key>
-	<string>flash</string>
-	<key>uuid</key>
-	<string>D864896E-8763-11D9-897C-000393CBCE2E</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/rails params.plist b/bundles/ruby-on-rails.tmbundle/Snippets/rails params.plist
deleted file mode 100644
index 6556cc99f..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/rails params.plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>params[:${1:id}]</string>
-	<key>keyEquivalent</key>
-	<string>^p</string>
-	<key>name</key>
-	<string>params[…]</string>
-	<key>scope</key>
-	<string>source.ruby.rails</string>
-	<key>uuid</key>
-	<string>AC8EDA3E-875B-11D9-897C-000393CBCE2E</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/rails session.plist b/bundles/ruby-on-rails.tmbundle/Snippets/rails session.plist
deleted file mode 100644
index 29e233e88..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/rails session.plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>session[:${1:user}]</string>
-	<key>keyEquivalent</key>
-	<string>^j</string>
-	<key>name</key>
-	<string>session[…]</string>
-	<key>scope</key>
-	<string>source.ruby.rails</string>
-	<key>uuid</key>
-	<string>7B02ABF8-8763-11D9-897C-000393CBCE2E</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/rea.plist b/bundles/ruby-on-rails.tmbundle/Snippets/rea.plist
deleted file mode 100644
index a057013b3..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/rea.plist
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>redirect_to :action =&gt; "${1:index}"</string>
-	<key>name</key>
-	<string>redirect_to (action)</string>
-	<key>scope</key>
-	<string>source.ruby.rails</string>
-	<key>tabTrigger</key>
-	<string>rea</string>
-	<key>uuid</key>
-	<string>F2F3167C-73B9-11D9-B752-000D932CD5BA</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/reai.plist b/bundles/ruby-on-rails.tmbundle/Snippets/reai.plist
deleted file mode 100644
index be95edbdf..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/reai.plist
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>redirect_to :action =&gt; "${1:show}", :id =&gt; ${0:@item}</string>
-	<key>name</key>
-	<string>redirect_to (action, id)</string>
-	<key>scope</key>
-	<string>source.ruby.rails</string>
-	<key>tabTrigger</key>
-	<string>reai</string>
-	<key>uuid</key>
-	<string>2233B484-73BA-11D9-B752-000D932CD5BA</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/rec.plist b/bundles/ruby-on-rails.tmbundle/Snippets/rec.plist
deleted file mode 100644
index e766697c7..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/rec.plist
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>redirect_to :controller =&gt; "${1:items}"</string>
-	<key>name</key>
-	<string>redirect_to (controller)</string>
-	<key>scope</key>
-	<string>source.ruby.rails</string>
-	<key>tabTrigger</key>
-	<string>rec</string>
-	<key>uuid</key>
-	<string>053490FE-73BA-11D9-B752-000D932CD5BA</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/reca.plist b/bundles/ruby-on-rails.tmbundle/Snippets/reca.plist
deleted file mode 100644
index c647a1916..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/reca.plist
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>redirect_to :controller =&gt; "${1:items}", :action =&gt; "${2:list}"</string>
-	<key>name</key>
-	<string>redirect_to (controller, action)</string>
-	<key>scope</key>
-	<string>source.ruby.rails</string>
-	<key>tabTrigger</key>
-	<string>reca</string>
-	<key>uuid</key>
-	<string>0C137FBF-73BA-11D9-B752-000D932CD5BA</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/recai.plist b/bundles/ruby-on-rails.tmbundle/Snippets/recai.plist
deleted file mode 100644
index d0922ab5c..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/recai.plist
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>redirect_to :controller =&gt; "${1:items}", :action =&gt; "${2:show}", :id =&gt; ${0:@item}</string>
-	<key>name</key>
-	<string>redirect_to (controller, action, id)</string>
-	<key>scope</key>
-	<string>source.ruby.rails</string>
-	<key>tabTrigger</key>
-	<string>recai</string>
-	<key>uuid</key>
-	<string>18D3C1C3-73BA-11D9-B752-000D932CD5BA</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/redirect_to (nested path plural).tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/redirect_to (nested path plural).tmSnippet
deleted file mode 100644
index 28e2ccd64..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/redirect_to (nested path plural).tmSnippet	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>redirect_to(${2:${10:parent}_${11:child}_path(${12:@}${13:${10}})})</string>
-	<key>name</key>
-	<string>redirect_to (nested path plural)</string>
-	<key>scope</key>
-	<string>source.ruby.rails</string>
-	<key>tabTrigger</key>
-	<string>renpp</string>
-	<key>uuid</key>
-	<string>EF527A27-D1D4-4FD8-BD23-71397881C29A</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/redirect_to (nested path).tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/redirect_to (nested path).tmSnippet
deleted file mode 100644
index 09312a71d..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/redirect_to (nested path).tmSnippet	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>redirect_to(${2:${12:parent}_${13:child}_path(${14:@}${15:${12}}, ${16:@}${17:${13}})})</string>
-	<key>name</key>
-	<string>redirect_to (nested path)</string>
-	<key>scope</key>
-	<string>source.ruby.rails</string>
-	<key>tabTrigger</key>
-	<string>renp</string>
-	<key>uuid</key>
-	<string>9D7228B3-A6ED-4598-B096-032B3600864F</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/redirect_to (path plural).tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/redirect_to (path plural).tmSnippet
deleted file mode 100644
index 65bd83e62..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/redirect_to (path plural).tmSnippet	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>redirect_to(${2:${10:model}s_path})</string>
-	<key>name</key>
-	<string>redirect_to (path plural)</string>
-	<key>scope</key>
-	<string>source.ruby.rails</string>
-	<key>tabTrigger</key>
-	<string>repp</string>
-	<key>uuid</key>
-	<string>AFE06B67-CE98-42A6-93D1-8EC8E3B9F83C</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/redirect_to (path).tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/redirect_to (path).tmSnippet
deleted file mode 100644
index f6bfdd0a0..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/redirect_to (path).tmSnippet	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>redirect_to(${2:${12:model}_path(${13:@}${14:${12}})})</string>
-	<key>name</key>
-	<string>redirect_to (path)</string>
-	<key>scope</key>
-	<string>source.ruby.rails</string>
-	<key>tabTrigger</key>
-	<string>rep</string>
-	<key>uuid</key>
-	<string>A909C4C3-8EFE-4E39-9D96-BA8F0ABE6085</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/render (action)... (ra).plist b/bundles/ruby-on-rails.tmbundle/Snippets/render (action)... (ra).plist
deleted file mode 100644
index 1b50d3f47..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/render (action)... (ra).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>render :action =&gt; "${1:action}"</string>
-	<key>name</key>
-	<string>render (action)</string>
-	<key>scope</key>
-	<string>source.ruby.rails</string>
-	<key>tabTrigger</key>
-	<string>ra</string>
-	<key>uuid</key>
-	<string>7B03D38B-7580-41AC-BC2B-3766AB074A43</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/render (action,layout) (ral).plist b/bundles/ruby-on-rails.tmbundle/Snippets/render (action,layout) (ral).plist
deleted file mode 100644
index b48d6b23b..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/render (action,layout) (ral).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>render :action =&gt; "${1:action}", :layout =&gt; "${2:layoutname}"</string>
-	<key>name</key>
-	<string>render (action, layout)</string>
-	<key>scope</key>
-	<string>source.ruby.rails</string>
-	<key>tabTrigger</key>
-	<string>ral</string>
-	<key>uuid</key>
-	<string>053F1D6A-B413-43FF-B697-E3120FD0489F</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/render (file) (rf).plist b/bundles/ruby-on-rails.tmbundle/Snippets/render (file) (rf).plist
deleted file mode 100644
index 7ef855488..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/render (file) (rf).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>render :file =&gt; "${1:filepath}"</string>
-	<key>name</key>
-	<string>render (file)</string>
-	<key>scope</key>
-	<string>source.ruby.rails</string>
-	<key>tabTrigger</key>
-	<string>rf</string>
-	<key>uuid</key>
-	<string>7D43B0EA-2C3C-499B-9346-A8E48CBF29CD</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/render (file,use_full_path) (rfu).plist b/bundles/ruby-on-rails.tmbundle/Snippets/render (file,use_full_path) (rfu).plist
deleted file mode 100644
index 2630b619c..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/render (file,use_full_path) (rfu).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>render :file =&gt; "${1:filepath}", :use_full_path =&gt; ${2:false}</string>
-	<key>name</key>
-	<string>render (file, use_full_path)</string>
-	<key>scope</key>
-	<string>source.ruby.rails</string>
-	<key>tabTrigger</key>
-	<string>rfu</string>
-	<key>uuid</key>
-	<string>2A8FBE48-E196-4019-AE76-BF3ED4B54F47</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/render (inline) (ri).plist b/bundles/ruby-on-rails.tmbundle/Snippets/render (inline) (ri).plist
deleted file mode 100644
index 1b262bfbc..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/render (inline) (ri).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>render :inline =&gt; "${1:&lt;%= 'hello' %&gt;}"</string>
-	<key>name</key>
-	<string>render (inline)</string>
-	<key>scope</key>
-	<string>source.ruby.rails</string>
-	<key>tabTrigger</key>
-	<string>ri</string>
-	<key>uuid</key>
-	<string>64E93A71-6E62-48D9-9694-123080AE6723</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/render (inline,locals) (ril).plist b/bundles/ruby-on-rails.tmbundle/Snippets/render (inline,locals) (ril).plist
deleted file mode 100644
index c519e2335..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/render (inline,locals) (ril).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>render :inline =&gt; "${1:&lt;%= 'hello' %&gt;}", :locals =&gt; { ${2::name} =&gt; "${3:value}"$4 }</string>
-	<key>name</key>
-	<string>render (inline, locals)</string>
-	<key>scope</key>
-	<string>source.ruby.rails</string>
-	<key>tabTrigger</key>
-	<string>ril</string>
-	<key>uuid</key>
-	<string>1E5DE984-510C-4992-8AD5-C5FA6D7F2A88</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/render (inline,type) (rit).plist b/bundles/ruby-on-rails.tmbundle/Snippets/render (inline,type) (rit).plist
deleted file mode 100644
index a61bf21aa..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/render (inline,type) (rit).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>render :inline =&gt; "${1:&lt;%= 'hello' %&gt;}", :type =&gt; ${2::rxml}</string>
-	<key>name</key>
-	<string>render (inline, type)</string>
-	<key>scope</key>
-	<string>source.ruby.rails</string>
-	<key>tabTrigger</key>
-	<string>rit</string>
-	<key>uuid</key>
-	<string>A8AF8B90-94E8-42E1-8057-DDBA57809F6A</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/render (layout) (rl).plist b/bundles/ruby-on-rails.tmbundle/Snippets/render (layout) (rl).plist
deleted file mode 100644
index d29c1a344..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/render (layout) (rl).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>render :layout =&gt; "${1:layoutname}"</string>
-	<key>name</key>
-	<string>render (layout)</string>
-	<key>scope</key>
-	<string>source.ruby.rails</string>
-	<key>tabTrigger</key>
-	<string>rl</string>
-	<key>uuid</key>
-	<string>3F83272F-62D5-4BCB-BAA3-806083078829</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/render (nothing) (rn).plist b/bundles/ruby-on-rails.tmbundle/Snippets/render (nothing) (rn).plist
deleted file mode 100644
index 22fa73b86..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/render (nothing) (rn).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>render :nothing =&gt; ${1:true}</string>
-	<key>name</key>
-	<string>render (nothing)</string>
-	<key>scope</key>
-	<string>source.ruby.rails</string>
-	<key>tabTrigger</key>
-	<string>rn</string>
-	<key>uuid</key>
-	<string>AC8A995F-0034-433C-905D-E5C1F29D6EFF</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/render (nothing,status) (rns).plist b/bundles/ruby-on-rails.tmbundle/Snippets/render (nothing,status) (rns).plist
deleted file mode 100644
index bbf95ad27..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/render (nothing,status) (rns).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>render :nothing =&gt; ${1:true}, :status =&gt; ${2:401}</string>
-	<key>name</key>
-	<string>render (nothing, status)</string>
-	<key>scope</key>
-	<string>source.ruby.rails</string>
-	<key>tabTrigger</key>
-	<string>rns</string>
-	<key>uuid</key>
-	<string>724A68C1-A727-46FF-AF59-288E26B09629</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/render (partial) (rp).plist b/bundles/ruby-on-rails.tmbundle/Snippets/render (partial) (rp).plist
deleted file mode 100644
index 5154b7565..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/render (partial) (rp).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>render :partial =&gt; "${1:item}"</string>
-	<key>name</key>
-	<string>render (partial)</string>
-	<key>scope</key>
-	<string>source.ruby.rails</string>
-	<key>tabTrigger</key>
-	<string>rp</string>
-	<key>uuid</key>
-	<string>498168A5-5AF8-4F59-8A2D-B517FAB98CDB</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/render (partial,collection) (rpc).plist b/bundles/ruby-on-rails.tmbundle/Snippets/render (partial,collection) (rpc).plist
deleted file mode 100644
index 24ff03d9f..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/render (partial,collection) (rpc).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>render :partial =&gt; "${1:item}", :collection =&gt; ${2:@$1s}</string>
-	<key>name</key>
-	<string>render (partial, collection)</string>
-	<key>scope</key>
-	<string>source.ruby.rails</string>
-	<key>tabTrigger</key>
-	<string>rpc</string>
-	<key>uuid</key>
-	<string>046FB1B6-9C65-4702-91EC-4AA9878CD949</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/render (partial,locals) (rpl).plist b/bundles/ruby-on-rails.tmbundle/Snippets/render (partial,locals) (rpl).plist
deleted file mode 100644
index d13bd8bf9..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/render (partial,locals) (rpl).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>render :partial =&gt; "${1:item}", :locals =&gt; { :${2:$1} =&gt; ${3:@$1}$0 }</string>
-	<key>name</key>
-	<string>render (partial, locals)</string>
-	<key>scope</key>
-	<string>source.ruby.rails</string>
-	<key>tabTrigger</key>
-	<string>rpl</string>
-	<key>uuid</key>
-	<string>6F41AFFD-B3A7-42D0-8A84-D6086C118D92</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/render (partial,object) (rpo).plist b/bundles/ruby-on-rails.tmbundle/Snippets/render (partial,object) (rpo).plist
deleted file mode 100644
index f9230a8d1..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/render (partial,object) (rpo).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>render :partial =&gt; "${1:item}", :object =&gt; ${2:@$1}</string>
-	<key>name</key>
-	<string>render (partial, object)</string>
-	<key>scope</key>
-	<string>source.ruby.rails</string>
-	<key>tabTrigger</key>
-	<string>rpo</string>
-	<key>uuid</key>
-	<string>BFAAC8DA-A043-4684-967B-B3E5DAE08C62</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/render (partial,status) (rps).plist b/bundles/ruby-on-rails.tmbundle/Snippets/render (partial,status) (rps).plist
deleted file mode 100644
index da70e9839..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/render (partial,status) (rps).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>render :partial =&gt; "${1:item}", :status =&gt; ${2:500}</string>
-	<key>name</key>
-	<string>render (partial, status)</string>
-	<key>scope</key>
-	<string>source.ruby.rails</string>
-	<key>tabTrigger</key>
-	<string>rps</string>
-	<key>uuid</key>
-	<string>CBB06A4E-3A82-45F3-91AA-259F02314B9D</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/render (text) (rt).plist b/bundles/ruby-on-rails.tmbundle/Snippets/render (text) (rt).plist
deleted file mode 100644
index f113cca3d..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/render (text) (rt).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>render :text =&gt; "${1:text to render...}"</string>
-	<key>name</key>
-	<string>render (text)</string>
-	<key>scope</key>
-	<string>source.ruby.rails</string>
-	<key>tabTrigger</key>
-	<string>rt</string>
-	<key>uuid</key>
-	<string>67C5082F-5011-434A-8EAA-6B8D3600935F</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/render (text,layout) (rtl).plist b/bundles/ruby-on-rails.tmbundle/Snippets/render (text,layout) (rtl).plist
deleted file mode 100644
index f98077913..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/render (text,layout) (rtl).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>render :text =&gt; "${1:text to render...}", :layout =&gt; "${2:layoutname}"</string>
-	<key>name</key>
-	<string>render (text, layout)</string>
-	<key>scope</key>
-	<string>source.ruby.rails</string>
-	<key>tabTrigger</key>
-	<string>rtl</string>
-	<key>uuid</key>
-	<string>A3B09AFE-40B5-4623-8B85-E9F369ECE22D</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/render (text,layout=%3Etrue) (rtlt).plist b/bundles/ruby-on-rails.tmbundle/Snippets/render (text,layout=%3Etrue) (rtlt).plist
deleted file mode 100644
index 038959d0b..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/render (text,layout=%3Etrue) (rtlt).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>render :text =&gt; "${1:text to render...}", :layout =&gt; ${2:true}</string>
-	<key>name</key>
-	<string>render (text, layout =&gt; true)</string>
-	<key>scope</key>
-	<string>source.ruby.rails</string>
-	<key>tabTrigger</key>
-	<string>rtlt</string>
-	<key>uuid</key>
-	<string>97C0992D-715F-4322-A3E0-DD4D2B7E2FC2</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/render (text,status) (rts).plist b/bundles/ruby-on-rails.tmbundle/Snippets/render (text,status) (rts).plist
deleted file mode 100644
index f480a3c28..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/render (text,status) (rts).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>render :text =&gt; "${1:text to render...}", :status =&gt; ${2:401}</string>
-	<key>name</key>
-	<string>render (text, status)</string>
-	<key>scope</key>
-	<string>source.ruby.rails</string>
-	<key>tabTrigger</key>
-	<string>rts</string>
-	<key>uuid</key>
-	<string>4F636977-F7A6-4BF5-B09B-7F087683C3B9</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/render (update).tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/render (update).tmSnippet
deleted file mode 100644
index e748a5db0..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/render (update).tmSnippet	
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>render :update do |${2:page}|
-	$2.$0
-end</string>
-	<key>name</key>
-	<string>render (update)</string>
-	<key>scope</key>
-	<string>source.ruby.rails</string>
-	<key>tabTrigger</key>
-	<string>ru</string>
-	<key>uuid</key>
-	<string>ECB10C0B-E8B7-4606-ABF5-4A2A26E5AB1A</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/respond_to (html).tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/respond_to (html).tmSnippet
deleted file mode 100644
index a694965f5..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/respond_to (html).tmSnippet	
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>respond_to do |wants|
-	wants.html do
-		$TM_SELECTED_TEXT
-	end
-	wants.${1:js} { $0 }
-end</string>
-	<key>keyEquivalent</key>
-	<string>@H</string>
-	<key>name</key>
-	<string>respond_to (html)</string>
-	<key>scope</key>
-	<string>meta.rails.controller</string>
-	<key>uuid</key>
-	<string>3BDD0D52-443E-4F5F-AE09-ABCC2ABE9A42</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/respond_to.tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/respond_to.tmSnippet
deleted file mode 100644
index 8d701e350..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/respond_to.tmSnippet
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>respond_to do |wants|
-	wants.${1:html}${2: { $0 \}}
-end</string>
-	<key>name</key>
-	<string>respond_to</string>
-	<key>scope</key>
-	<string>meta.rails.controller</string>
-	<key>tabTrigger</key>
-	<string>rest</string>
-	<key>uuid</key>
-	<string>B41D3164-EA53-4DDC-850E-27B82B24061F</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/returning do %7Cvariable%7C %E2%80%A6 end.tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/returning do %7Cvariable%7C %E2%80%A6 end.tmSnippet
deleted file mode 100644
index 09ed7a5d8..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/returning do %7Cvariable%7C %E2%80%A6 end.tmSnippet	
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>returning ${1:variable} do${2/(^(?&lt;var&gt;\s*[a-z_][a-zA-Z0-9_]*\s*)(,\g&lt;var&gt;)*,?\s*$)|.*/(?1: |)/}${2:v}${2/(^(?&lt;var&gt;\s*[a-z_][a-zA-Z0-9_]*\s*)(,\g&lt;var&gt;)*,?\s*$)|.*/(?1:|)/}
-	$0
-end</string>
-	<key>name</key>
-	<string>returning do |variable| … end</string>
-	<key>scope</key>
-	<string>source.ruby.rails</string>
-	<key>tabTrigger</key>
-	<string>returning</string>
-	<key>uuid</key>
-	<string>D2783155-23F3-4B90-A317-5BD139471193</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/stylesheet_link_tag.tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/stylesheet_link_tag.tmSnippet
deleted file mode 100644
index b49a775f3..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/stylesheet_link_tag.tmSnippet
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>${TM_RAILS_TEMPLATE_START_RUBY_EXPR}stylesheet_link_tag {1::all}${2:, :cache =&gt; ${3:true}}${TM_RAILS_TEMPLATE_END_RUBY_EXPR}</string>
-	<key>name</key>
-	<string>stylesheet_link_tag</string>
-	<key>scope</key>
-	<string>text.html.ruby</string>
-	<key>tabTrigger</key>
-	<string>slt</string>
-	<key>uuid</key>
-	<string>980C7667-9D60-49FF-AF74-A7B19B379F45</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/submit_tag.tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/submit_tag.tmSnippet
deleted file mode 100644
index 9c6b84fc7..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/submit_tag.tmSnippet
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>${TM_RAILS_TEMPLATE_START_RUBY_EXPR}submit_tag "${1:Save changes}"${2:, :id =&gt; "${3:submit}"}${4:, :name =&gt; "${5:$3}"}${6:, :class =&gt; "${7:form_$3}"}${8:, :disabled =&gt; ${9:false}}${10:, :disable_with =&gt; "${11:Please wait...}"}${TM_RAILS_TEMPLATE_END_RUBY_EXPR}</string>
-	<key>name</key>
-	<string>submit_tag</string>
-	<key>scope</key>
-	<string>text.html.ruby, text.haml</string>
-	<key>tabTrigger</key>
-	<string>st</string>
-	<key>uuid</key>
-	<string>D0E29200-E910-11DC-A399-00112475D960</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/t_binary (tcbi).tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/t_binary (tcbi).tmSnippet
deleted file mode 100644
index b0a8b49be..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/t_binary (tcbi).tmSnippet	
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>t.binary :${1:title}${2:, :limit =&gt; ${3:2}.megabytes}
-t.$0</string>
-	<key>name</key>
-	<string>t.binary (tcbi)</string>
-	<key>scope</key>
-	<string>meta.rails.migration.create_table, meta.rails.migration.change_table</string>
-	<key>tabTrigger</key>
-	<string>t.</string>
-	<key>uuid</key>
-	<string>7CE57C6C-E4BE-11DC-A11A-00112475D960</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/t_boolean (tcb).tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/t_boolean (tcb).tmSnippet
deleted file mode 100644
index 9310b8359..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/t_boolean (tcb).tmSnippet	
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>t.boolean :${1:title}
-t.$0</string>
-	<key>name</key>
-	<string>t.boolean (tcb)</string>
-	<key>scope</key>
-	<string>meta.rails.migration.create_table, meta.rails.migration.change_table</string>
-	<key>tabTrigger</key>
-	<string>t.</string>
-	<key>uuid</key>
-	<string>6BE6F315-E4BE-11DC-A11A-00112475D960</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/t_date (tcda).tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/t_date (tcda).tmSnippet
deleted file mode 100644
index c1199ab2f..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/t_date (tcda).tmSnippet	
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>t.date :${1:title}
-t.$0</string>
-	<key>name</key>
-	<string>t.date (tcda)</string>
-	<key>scope</key>
-	<string>meta.rails.migration.create_table, meta.rails.migration.change_table</string>
-	<key>tabTrigger</key>
-	<string>t.</string>
-	<key>uuid</key>
-	<string>61CF5B32-E4BE-11DC-A11A-00112475D960</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/t_datetime (tcdt).tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/t_datetime (tcdt).tmSnippet
deleted file mode 100644
index a8fc8276d..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/t_datetime (tcdt).tmSnippet	
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>t.datetime :${1:title}
-t.$0</string>
-	<key>name</key>
-	<string>t.datetime (tcdt)</string>
-	<key>scope</key>
-	<string>meta.rails.migration.create_table, meta.rails.migration.change_table</string>
-	<key>tabTrigger</key>
-	<string>t.</string>
-	<key>uuid</key>
-	<string>3458B140-E4BE-11DC-A11A-00112475D960</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/t_decimal (tcd).tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/t_decimal (tcd).tmSnippet
deleted file mode 100644
index d2d03e7c2..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/t_decimal (tcd).tmSnippet	
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>t.decimal :${1:title}${2:${3:, :precision =&gt; ${4:10}}${5:, :scale =&gt; ${6:2}}}
-t.$0</string>
-	<key>name</key>
-	<string>t.decimal (tcd)</string>
-	<key>scope</key>
-	<string>meta.rails.migration.create_table, meta.rails.migration.change_table</string>
-	<key>tabTrigger</key>
-	<string>t.</string>
-	<key>uuid</key>
-	<string>26C09807-E4BE-11DC-A11A-00112475D960</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/t_float (tcf).tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/t_float (tcf).tmSnippet
deleted file mode 100644
index e900c1ef6..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/t_float (tcf).tmSnippet	
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>t.float :${1:title}
-t.$0</string>
-	<key>name</key>
-	<string>t.float (tcf)</string>
-	<key>scope</key>
-	<string>meta.rails.migration.create_table, meta.rails.migration.change_table</string>
-	<key>tabTrigger</key>
-	<string>t.</string>
-	<key>uuid</key>
-	<string>1BDC463A-E4BE-11DC-A11A-00112475D960</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/t_integer (tci).tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/t_integer (tci).tmSnippet
deleted file mode 100644
index 543404934..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/t_integer (tci).tmSnippet	
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>t.integer :${1:title}
-t.$0</string>
-	<key>name</key>
-	<string>t.integer (tci)</string>
-	<key>scope</key>
-	<string>meta.rails.migration.create_table, meta.rails.migration.change_table</string>
-	<key>tabTrigger</key>
-	<string>t.</string>
-	<key>uuid</key>
-	<string>0E63B7D5-E4BE-11DC-A11A-00112475D960</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/t_lock_version (tcl).tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/t_lock_version (tcl).tmSnippet
deleted file mode 100644
index 931303f52..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/t_lock_version (tcl).tmSnippet	
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>t.integer :lock_version, :null =&gt; false, :default =&gt; 0
-t.$0</string>
-	<key>name</key>
-	<string>t.lock_version (tcl)</string>
-	<key>scope</key>
-	<string>meta.rails.migration.create_table, meta.rails.migration.change_table</string>
-	<key>tabTrigger</key>
-	<string>t.</string>
-	<key>uuid</key>
-	<string>A677FFD4-E4BE-11DC-A11A-00112475D960</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/t_references (tcr).tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/t_references (tcr).tmSnippet
deleted file mode 100644
index 2dba2cbda..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/t_references (tcr).tmSnippet	
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>t.references :${1:taggable}${2:, :polymorphic =&gt; ${3:{ :default =&gt; '${4:Photo}' \}}}
-t.$0</string>
-	<key>name</key>
-	<string>t.references (tcr)</string>
-	<key>scope</key>
-	<string>meta.rails.migration.create_table, meta.rails.migration.change_table</string>
-	<key>tabTrigger</key>
-	<string>t.</string>
-	<key>uuid</key>
-	<string>B6D9225C-E4BE-11DC-A11A-00112475D960</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/t_rename (tre).tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/t_rename (tre).tmSnippet
deleted file mode 100644
index 2e8b1c726..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/t_rename (tre).tmSnippet	
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>t.rename(:${1:old_column_name}, :${2:new_column_name})
-t.$0</string>
-	<key>name</key>
-	<string>t.rename (tre)</string>
-	<key>scope</key>
-	<string>meta.rails.migration.create_table, meta.rails.migration.change_table</string>
-	<key>tabTrigger</key>
-	<string>t.</string>
-	<key>uuid</key>
-	<string>9D4E30E2-4A61-4941-B9F3-BEE97552747A</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/t_string (tcs).tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/t_string (tcs).tmSnippet
deleted file mode 100644
index e6500a8af..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/t_string (tcs).tmSnippet	
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>t.string :${1:title}
-t.$0</string>
-	<key>name</key>
-	<string>t.string (tcs)</string>
-	<key>scope</key>
-	<string>meta.rails.migration.create_table, meta.rails.migration.change_table</string>
-	<key>tabTrigger</key>
-	<string>t.</string>
-	<key>uuid</key>
-	<string>B757F7E5-E4BD-11DC-A11A-00112475D960</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/t_text (tct).tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/t_text (tct).tmSnippet
deleted file mode 100644
index 94acdbd4b..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/t_text (tct).tmSnippet	
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>t.text :${1:title}
-t.$0</string>
-	<key>name</key>
-	<string>t.text (tct)</string>
-	<key>scope</key>
-	<string>meta.rails.migration.create_table, meta.rails.migration.change_table</string>
-	<key>tabTrigger</key>
-	<string>t.</string>
-	<key>uuid</key>
-	<string>FFE7B820-E4BD-11DC-A11A-00112475D960</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/t_time (tcti).tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/t_time (tcti).tmSnippet
deleted file mode 100644
index 8b70a5889..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/t_time (tcti).tmSnippet	
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>t.time :${1:title}
-t.$0</string>
-	<key>name</key>
-	<string>t.time (tcti)</string>
-	<key>scope</key>
-	<string>meta.rails.migration.create_table, meta.rails.migration.change_table</string>
-	<key>tabTrigger</key>
-	<string>t.</string>
-	<key>uuid</key>
-	<string>537BDD48-E4BE-11DC-A11A-00112475D960</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/t_timestamp (tcts).tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/t_timestamp (tcts).tmSnippet
deleted file mode 100644
index 2dcd886ea..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/t_timestamp (tcts).tmSnippet	
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>t.timestamp :${1:title}
-t.$0</string>
-	<key>name</key>
-	<string>t.timestamp (tcts)</string>
-	<key>scope</key>
-	<string>meta.rails.migration.create_table, meta.rails.migration.change_table</string>
-	<key>tabTrigger</key>
-	<string>t.</string>
-	<key>uuid</key>
-	<string>49643690-E4BE-11DC-A11A-00112475D960</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/t_timestamps (tctss).tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/t_timestamps (tctss).tmSnippet
deleted file mode 100644
index 3957742af..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/t_timestamps (tctss).tmSnippet	
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>t.timestamps
-t.$0</string>
-	<key>name</key>
-	<string>t.timestamps (tctss)</string>
-	<key>scope</key>
-	<string>meta.rails.migration.create_table, meta.rails.migration.change_table</string>
-	<key>tabTrigger</key>
-	<string>t.</string>
-	<key>uuid</key>
-	<string>950B0BF2-E4BE-11DC-A11A-00112475D960</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/validates_acceptance_of if.tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/validates_acceptance_of if.tmSnippet
deleted file mode 100644
index 726d59a38..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/validates_acceptance_of if.tmSnippet	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>validates_acceptance_of :${1:terms}${2:${3:, :accept =&gt; "${4:1}"}${5:, :message =&gt; "${6:You must accept the terms of service}"}}, :if =&gt; proc { |obj| ${7:obj.condition?} }}</string>
-	<key>name</key>
-	<string>validates_acceptance_of if</string>
-	<key>scope</key>
-	<string>source.ruby.rails</string>
-	<key>tabTrigger</key>
-	<string>vaoif</string>
-	<key>uuid</key>
-	<string>A2477223-AD5A-4723-8052-943CE9BA634D</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/validates_acceptance_of.tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/validates_acceptance_of.tmSnippet
deleted file mode 100644
index 0869ab9ea..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/validates_acceptance_of.tmSnippet
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>validates_acceptance_of :${1:terms}${2:${3:, :accept =&gt; "${4:1}"}${5:, :message =&gt; "${6:You must accept the terms of service}"}}</string>
-	<key>name</key>
-	<string>validates_acceptance_of</string>
-	<key>scope</key>
-	<string>source.ruby.rails</string>
-	<key>tabTrigger</key>
-	<string>vao</string>
-	<key>uuid</key>
-	<string>89198999-7E6D-4D97-A20E-45263E1CA993</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/validates_associated (va).plist b/bundles/ruby-on-rails.tmbundle/Snippets/validates_associated (va).plist
deleted file mode 100644
index 4827d3b7c..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/validates_associated (va).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>validates_associated :${1:attribute}${2:, :on =&gt; :${3:create}}</string>
-	<key>name</key>
-	<string>validates_associated</string>
-	<key>scope</key>
-	<string>source.ruby.rails</string>
-	<key>tabTrigger</key>
-	<string>va</string>
-	<key>uuid</key>
-	<string>47944705-F605-4ED4-B4C0-9E823EE25138</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/validates_associated if (vaif).plist b/bundles/ruby-on-rails.tmbundle/Snippets/validates_associated if (vaif).plist
deleted file mode 100644
index a24433d78..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/validates_associated if (vaif).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>validates_associated :${1:attribute}${2:, :on =&gt; :${3:create}, :if =&gt; proc { |obj| ${5:obj.condition?} }}</string>
-	<key>name</key>
-	<string>validates_associated if</string>
-	<key>scope</key>
-	<string>source.ruby.rails</string>
-	<key>tabTrigger</key>
-	<string>vaif</string>
-	<key>uuid</key>
-	<string>85E9264C-5414-4FA0-AC07-F305A798ED46</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/validates_confirmation_of (vc).plist b/bundles/ruby-on-rails.tmbundle/Snippets/validates_confirmation_of (vc).plist
deleted file mode 100644
index 6d4711a0e..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/validates_confirmation_of (vc).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>validates_confirmation_of :${1:attribute}${2:, :on =&gt; :${3:create}, :message =&gt; "${4:should match confirmation}"}</string>
-	<key>name</key>
-	<string>validates_confirmation_of</string>
-	<key>scope</key>
-	<string>source.ruby.rails</string>
-	<key>tabTrigger</key>
-	<string>vc</string>
-	<key>uuid</key>
-	<string>B5893618-D07C-48F1-8867-736D0AAFF0E7</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/validates_confirmation_of if (vcif).plist b/bundles/ruby-on-rails.tmbundle/Snippets/validates_confirmation_of if (vcif).plist
deleted file mode 100644
index b747ad17b..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/validates_confirmation_of if (vcif).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>validates_confirmation_of :${1:attribute}${2:, :on =&gt; :${3:create}, :message =&gt; "${4:should match confirmation}", :if =&gt; proc { |obj| ${5:obj.condition?} }}</string>
-	<key>name</key>
-	<string>validates_confirmation_of if</string>
-	<key>scope</key>
-	<string>source.ruby.rails</string>
-	<key>tabTrigger</key>
-	<string>vcif</string>
-	<key>uuid</key>
-	<string>1354726C-DA64-4CA6-A099-26626A865D8D</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/validates_exclusion_of (ve).plist b/bundles/ruby-on-rails.tmbundle/Snippets/validates_exclusion_of (ve).plist
deleted file mode 100644
index 50783f6a1..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/validates_exclusion_of (ve).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>validates_exclusion_of :${1:attribute}${2:, :in =&gt; ${3:%w( ${4:mov avi} )}, :on =&gt; :${5:create}, :message =&gt; "${6:extension %s is not allowed}"}</string>
-	<key>name</key>
-	<string>validates_exclusion_of</string>
-	<key>scope</key>
-	<string>source.ruby.rails</string>
-	<key>tabTrigger</key>
-	<string>ve</string>
-	<key>uuid</key>
-	<string>4CC98A56-B60B-4A89-80E0-400C5314A050</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/validates_exclusion_of if (veif).plist b/bundles/ruby-on-rails.tmbundle/Snippets/validates_exclusion_of if (veif).plist
deleted file mode 100644
index 5f7079567..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/validates_exclusion_of if (veif).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>validates_exclusion_of :${1:attribute}${2:, :in =&gt; ${3:%w( ${4:mov avi} )}, :on =&gt; :${5:create}, :message =&gt; "${6:extension %s is not allowed}"}, :if =&gt; proc { |obj| ${7:obj.condition?} }}</string>
-	<key>name</key>
-	<string>validates_exclusion_of if</string>
-	<key>scope</key>
-	<string>source.ruby.rails</string>
-	<key>tabTrigger</key>
-	<string>veif</string>
-	<key>uuid</key>
-	<string>869AB0B7-12DD-440A-905A-BFB1E0E16E1C</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/validates_format_of if.tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/validates_format_of if.tmSnippet
deleted file mode 100644
index abeb64e8a..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/validates_format_of if.tmSnippet	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>validates_format_of :${1:attribute}, :with =&gt; /${2:^[${3:\w\d}]+\$}/${4:, :on =&gt; :${5:create}, :message =&gt; "${6:is invalid}"}, :if =&gt; proc { |obj| ${7:obj.condition?} }}</string>
-	<key>name</key>
-	<string>validates_format_of if</string>
-	<key>scope</key>
-	<string>source.ruby.rails</string>
-	<key>tabTrigger</key>
-	<string>vfif</string>
-	<key>uuid</key>
-	<string>14BF0586-F2E8-4AB3-BB4B-E49099384403</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/validates_format_of.tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/validates_format_of.tmSnippet
deleted file mode 100644
index 177c31107..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/validates_format_of.tmSnippet
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>validates_format_of :${1:attribute}, :with =&gt; /${2:^[${3:\w\d}]+\$}/${4:, :on =&gt; :${5:create}, :message =&gt; "${6:is invalid}"}</string>
-	<key>name</key>
-	<string>validates_format_of</string>
-	<key>scope</key>
-	<string>source.ruby.rails</string>
-	<key>tabTrigger</key>
-	<string>vf</string>
-	<key>uuid</key>
-	<string>EB47FBA1-AFB3-42F9-94A4-552D3175C17A</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/validates_inclusion_of if.tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/validates_inclusion_of if.tmSnippet
deleted file mode 100644
index 235d87bcf..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/validates_inclusion_of if.tmSnippet	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>validates_inclusion_of :${1:attribute}${2:, :in =&gt; ${3:%w( ${4:mov avi} )}, :on =&gt; :${5:create}, :message =&gt; "${6:extension %s is not included in the list}"}, :if =&gt; proc { |obj| ${7:obj.condition?} }}</string>
-	<key>name</key>
-	<string>validates_inclusion_of if</string>
-	<key>scope</key>
-	<string>source.ruby.rails</string>
-	<key>tabTrigger</key>
-	<string>viif</string>
-	<key>uuid</key>
-	<string>47FF50AF-E9BF-11DC-8518-00112475D960</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/validates_inclusion_of.tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/validates_inclusion_of.tmSnippet
deleted file mode 100644
index 6aaa9f173..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/validates_inclusion_of.tmSnippet
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>validates_inclusion_of :${1:attribute}${2:, :in =&gt; ${3:%w( ${4:mov avi} )}, :on =&gt; :${5:create}, :message =&gt; "${6:extension %s is not included in the list}"}</string>
-	<key>name</key>
-	<string>validates_inclusion_of</string>
-	<key>scope</key>
-	<string>source.ruby.rails</string>
-	<key>tabTrigger</key>
-	<string>vi</string>
-	<key>uuid</key>
-	<string>4611F02E-E9BF-11DC-8518-00112475D960</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/validates_length_of (vl).plist b/bundles/ruby-on-rails.tmbundle/Snippets/validates_length_of (vl).plist
deleted file mode 100644
index 433f9b46b..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/validates_length_of (vl).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>validates_length_of :${1:attribute}, :within =&gt; ${2:3..20}${3:, :on =&gt; :${4:create}, :message =&gt; "${5:must be present}"}</string>
-	<key>name</key>
-	<string>validates_length_of</string>
-	<key>scope</key>
-	<string>source.ruby.rails</string>
-	<key>tabTrigger</key>
-	<string>vl</string>
-	<key>uuid</key>
-	<string>5CE8838A-BF2C-497E-B87A-E90C3BC482E0</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/validates_length_of if.tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/validates_length_of if.tmSnippet
deleted file mode 100644
index 025e14658..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/validates_length_of if.tmSnippet	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>validates_length_of :${1:attribute}, :within =&gt; ${2:3..20}${3:, :on =&gt; :${4:create}, :message =&gt; "${5:must be present}"}, :if =&gt; proc { |obj| ${6:obj.condition?} }}</string>
-	<key>name</key>
-	<string>validates_length_of if</string>
-	<key>scope</key>
-	<string>source.ruby.rails</string>
-	<key>tabTrigger</key>
-	<string>vlif</string>
-	<key>uuid</key>
-	<string>EC511A43-D3B7-11DC-BA49-00112475D960</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/validates_numericality_of if.tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/validates_numericality_of if.tmSnippet
deleted file mode 100644
index 675bc4617..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/validates_numericality_of if.tmSnippet	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>validates_numericality_of :${1:attribute}${2:, :on =&gt; :${3:create}, :message =&gt; "${4:is not a number}"}, :if =&gt; proc { |obj| ${5:obj.condition?} }}</string>
-	<key>name</key>
-	<string>validates_numericality_of if</string>
-	<key>scope</key>
-	<string>source.ruby.rails</string>
-	<key>tabTrigger</key>
-	<string>vnif</string>
-	<key>uuid</key>
-	<string>CF506019-E964-4172-A3DA-475AE3B65558</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/validates_numericality_of.tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/validates_numericality_of.tmSnippet
deleted file mode 100644
index 633edbf29..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/validates_numericality_of.tmSnippet
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>validates_numericality_of :${1:attribute}${2:, :on =&gt; :${3:create}, :message =&gt; "${4:is not a number}"}</string>
-	<key>name</key>
-	<string>validates_numericality_of</string>
-	<key>scope</key>
-	<string>source.ruby.rails</string>
-	<key>tabTrigger</key>
-	<string>vn</string>
-	<key>uuid</key>
-	<string>B21BA16D-7C04-4912-8488-425CDCC332A8</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/validates_presence_of (vp).plist b/bundles/ruby-on-rails.tmbundle/Snippets/validates_presence_of (vp).plist
deleted file mode 100644
index a502de862..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/validates_presence_of (vp).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>validates_presence_of :${1:attribute}${2:, :on =&gt; :${3:create}, :message =&gt; "${4:can't be blank}"}</string>
-	<key>name</key>
-	<string>validates_presence_of</string>
-	<key>scope</key>
-	<string>source.ruby.rails</string>
-	<key>tabTrigger</key>
-	<string>vp</string>
-	<key>uuid</key>
-	<string>5DAC28A7-33C8-4DA7-9E85-56618D6BEC9F</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/validates_presence_of if (vpif) 2.plist b/bundles/ruby-on-rails.tmbundle/Snippets/validates_presence_of if (vpif) 2.plist
deleted file mode 100644
index 5dbd39c92..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/validates_presence_of if (vpif) 2.plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>validates_presence_of :${1:attribute}${2:, :on =&gt; :${3:create}, :message =&gt; "${4:can't be blank}"}, :if =&gt; proc { |obj| ${5:obj.condition?} }}</string>
-	<key>name</key>
-	<string>validates_presence_of if</string>
-	<key>scope</key>
-	<string>source.ruby.rails</string>
-	<key>tabTrigger</key>
-	<string>vpif</string>
-	<key>uuid</key>
-	<string>F5CBBE16-F5CC-4EDA-8BC6-30281BD7D854</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/validates_uniqueness_of (vu).plist b/bundles/ruby-on-rails.tmbundle/Snippets/validates_uniqueness_of (vu).plist
deleted file mode 100644
index 3b96b2f41..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/validates_uniqueness_of (vu).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>validates_uniqueness_of :${1:attribute}${2:, :on =&gt; :${3:create}, :message =&gt; "${4:must be unique}"}</string>
-	<key>name</key>
-	<string>validates_uniqueness_of</string>
-	<key>scope</key>
-	<string>source.ruby.rails</string>
-	<key>tabTrigger</key>
-	<string>vu</string>
-	<key>uuid</key>
-	<string>F8316545-9AE4-4C7F-87ED-A2C00E6637FA</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/validates_uniqueness_of if (vuif).plist b/bundles/ruby-on-rails.tmbundle/Snippets/validates_uniqueness_of if (vuif).plist
deleted file mode 100644
index edd92f65d..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/validates_uniqueness_of if (vuif).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>validates_uniqueness_of :${1:attribute}${2:, :on =&gt; :${3:create}, :message =&gt; "${4:must be unique}", :if =&gt; proc { |obj| ${6:obj.condition?} }}</string>
-	<key>name</key>
-	<string>validates_uniqueness_of if</string>
-	<key>scope</key>
-	<string>source.ruby.rails</string>
-	<key>tabTrigger</key>
-	<string>vuif</string>
-	<key>uuid</key>
-	<string>43680344-0818-42BF-95B4-58CD2D76545B</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/verify (verify).plist b/bundles/ruby-on-rails.tmbundle/Snippets/verify (verify).plist
deleted file mode 100644
index 62d69f108..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/verify (verify).plist	
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>bundlePath</key>
-	<string>/Users/tobi/Library/Application Support/TextMate/Bundles/Custom.tmbundle</string>
-	<key>content</key>
-	<string>verify :only =&gt; [:$1], :method =&gt; :post, :render =&gt; {:status =&gt; 500, :text =&gt; "use HTTP-POST"}
-</string>
-	<key>name</key>
-	<string>verify — render</string>
-	<key>scope</key>
-	<string>source.ruby.rails</string>
-	<key>tabTrigger</key>
-	<string>verify</string>
-	<key>uuid</key>
-	<string>9ECBF20C-003E-41D9-A881-4BAC0656F9DC</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/verify - redirect (verify).plist b/bundles/ruby-on-rails.tmbundle/Snippets/verify - redirect (verify).plist
deleted file mode 100644
index 3971e3ff7..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/verify - redirect (verify).plist	
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>bundlePath</key>
-	<string>/Users/tobi/Library/Application Support/TextMate/Bundles/Custom.tmbundle</string>
-	<key>content</key>
-	<string>verify :only =&gt; [:$1], :session =&gt; :user, :params =&gt; :id, :redirect_to =&gt; {:action =&gt; '${2:index}'}
-</string>
-	<key>name</key>
-	<string>verify — redirect</string>
-	<key>scope</key>
-	<string>source.ruby.rails</string>
-	<key>tabTrigger</key>
-	<string>verify</string>
-	<key>uuid</key>
-	<string>7BBD3F57-57A5-4CD0-8E79-B931021FC110</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/wants_format.tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/wants_format.tmSnippet
deleted file mode 100644
index ac8def947..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/wants_format.tmSnippet
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>wants.${1:js|xml|html}${2: { $0 \}}</string>
-	<key>name</key>
-	<string>wants.format</string>
-	<key>scope</key>
-	<string>meta.rails.controller</string>
-	<key>tabTrigger</key>
-	<string>wants</string>
-	<key>uuid</key>
-	<string>3F26FDB4-ACF9-4856-9312-6A4D78DC8564</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/xhr delete.tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/xhr delete.tmSnippet
deleted file mode 100644
index aa2d909ba..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/xhr delete.tmSnippet	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>xhr :delete, :${1:destroy}, :id =&gt; ${2:1}$0</string>
-	<key>name</key>
-	<string>xhr delete</string>
-	<key>scope</key>
-	<string>source.ruby.rails</string>
-	<key>tabTrigger</key>
-	<string>xdelete</string>
-	<key>uuid</key>
-	<string>F1BE0C3D-7203-43E9-BEFB-D1A99CDD31C1</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/xhr get.tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/xhr get.tmSnippet
deleted file mode 100644
index 2bc363728..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/xhr get.tmSnippet	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>xhr :get, :${1:show}${2:, :id =&gt; ${3:1}}$0</string>
-	<key>name</key>
-	<string>xhr get</string>
-	<key>scope</key>
-	<string>source.ruby.rails</string>
-	<key>tabTrigger</key>
-	<string>xget</string>
-	<key>uuid</key>
-	<string>78FCF992-D01B-404F-BC54-5EE7B91F999A</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/xhr post.tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/xhr post.tmSnippet
deleted file mode 100644
index 064195d7a..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/xhr post.tmSnippet	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>xhr :post, :${1:create}, :${2:object} =&gt; { $3 }</string>
-	<key>name</key>
-	<string>xhr post</string>
-	<key>scope</key>
-	<string>source.ruby.rails</string>
-	<key>tabTrigger</key>
-	<string>xpost</string>
-	<key>uuid</key>
-	<string>62C3838B-0790-4FC2-8425-F273A57F5D33</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Snippets/xhr put.tmSnippet b/bundles/ruby-on-rails.tmbundle/Snippets/xhr put.tmSnippet
deleted file mode 100644
index 5d1fdd999..000000000
--- a/bundles/ruby-on-rails.tmbundle/Snippets/xhr put.tmSnippet	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>xhr :put, :${1:update}, :id =&gt; ${2:1}, :${3:object} =&gt; { $4 }$0</string>
-	<key>name</key>
-	<string>xhr put</string>
-	<key>scope</key>
-	<string>source.ruby.rails</string>
-	<key>tabTrigger</key>
-	<string>xput</string>
-	<key>uuid</key>
-	<string>C12C98A5-74E5-4E70-9ADB-8783455D6539</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Support/bin/create_partial_from_selection.rb b/bundles/ruby-on-rails.tmbundle/Support/bin/create_partial_from_selection.rb
deleted file mode 100755
index 4eb54a9fa..000000000
--- a/bundles/ruby-on-rails.tmbundle/Support/bin/create_partial_from_selection.rb
+++ /dev/null
@@ -1,94 +0,0 @@
-#!/usr/bin/env ruby
-# encoding: utf-8
-
-# Copyright:
-#   (c) 2006 syncPEOPLE, LLC.
-#   Visit us at http://syncpeople.com/
-# Author: Duane Johnson (duane.johnson@gmail.com)
-# Description:
-#   Creates a partial from the selected text (asks for the partial name)
-#   and replaces the text with a "render :partial => [partial_name]" erb fragment.
-
-require 'rails_bundle_tools'
-
-current_file = RailsPath.new
-
-# Make sure we're in a view file
-unless current_file.file_type == :view
-  TextMate.exit_show_tool_tip("The ‘create partial from selection’ action works within view files only.")
-end
-
-# If text is selected, create a partial out of it
-if TextMate.selected_text
-  partial_name = TextMate::UI.request_string(
-    :title => "Create a partial from the selected text", 
-    :default => "partial",
-    :prompt => "Name of the new partial: (omit the _ and .html.erb)",
-    :button1 => 'Create'
-  )
-
-  if partial_name
-    path = current_file.dirname
-    partial = File.join(path, "_#{partial_name}.html.erb")
-
-    # Create the partial file
-    if File.exist?(partial)
-      unless TextMate::UI.request_confirmation(
-        :button1 => "Overwrite",
-        :button2 => "Cancel",
-        :title => "The partial file already exists.",
-        :prompt => "Do you want to overwrite it?"
-      )
-        TextMate.exit_discard
-      end
-    end
-
-    file = File.open(partial, "w") { |f| f.write(TextMate.selected_text) }
-    TextMate.rescan_project
-
-    # Return the new render :partial line
-    print "<%= render :partial => '#{partial_name}' %>\n"
-  else
-    TextMate.exit_discard
-  end
-else
-  # Otherwise, toggle inline partials if they exist
-
-  text = ""
-  partial_block_re =
-    /<!--\s*\[\[\s*Partial\s'(.+?)'\sBegin\s*\]\]\s*-->\n(.+)<!--\s*\[\[\s*Partial\s'\1'\sEnd\s*\]\]\s*-->\n/m
-
-  # Inline partials exist?
-  if current_file.buffer =~ partial_block_re
-    text = current_file.buffer.text
-    while text =~ partial_block_re
-      partial_name, partial_text = $1, $2
-      File.open(partial_name, "w") { |f| f.write $2 }
-      text.sub! partial_block_re, ''
-    end
-  else
-  # See if there are any render :partial statements to expand
-    current_file.buffer.lines.each_with_index do |line, i|
-      text << line
-      if line =~ /render[\s\(].*:partial\s*=>\s*['"](.+?)['"]/
-        partial_name = $1
-        modules = current_file.modules + [current_file.controller_name]
-
-        # Check for absolute path to partial file
-        if partial_name.include?('/')
-          pieces = partial_name.split('/')
-          partial_name = pieces.pop
-          modules = pieces
-        end
-
-        partial = File.join(current_file.rails_root, 'app', 'views', modules, "_#{partial_name}.html.erb")
-
-        text << "<!-- [[ Partial '#{partial}' Begin ]] -->\n"
-        text << IO.read(partial).gsub("\r\n", "\n")
-        text << "<!-- [[ Partial '#{partial}' End ]] -->\n"
-      end
-    end
-  end
-  print text
-  TextMate.exit_replace_document
-end
\ No newline at end of file
diff --git a/bundles/ruby-on-rails.tmbundle/Support/bin/fixture_auto_complete.rb b/bundles/ruby-on-rails.tmbundle/Support/bin/fixture_auto_complete.rb
deleted file mode 100644
index 04a1a942f..000000000
--- a/bundles/ruby-on-rails.tmbundle/Support/bin/fixture_auto_complete.rb
+++ /dev/null
@@ -1,84 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'rails_bundle_tools'
-require 'yaml'
-require File.join(ENV['TM_SUPPORT_PATH'], "lib", "escape")
-DIALOG = ENV['DIALOG']
-
-def parse_line
-  current_line = TextMate.current_line
-  if RailsPath.new.file_type == :fixture
-    if fixture_finder = current_line.match(/^([\s\t]+)\b([a-z_]+)\:([a-z_]*)/)
-      [:fixture] + fixture_finder[1..3]
-    end
-  else
-    if fixture_finder = current_line.match(/^([\s\t]+).*\b([a-z_]+)\(\:([a-z_]*)\)/)
-      [:test] + fixture_finder[1..3]
-    end
-  end
-end
-
-def load_referenced_fixture_file(ref)
-  ref_plural = Inflector.pluralize(ref)
-  ref_file = File.join(TextMate.project_directory, "test", "fixtures", "#{ref_plural}.yml")
-  if (!File.exist?(ref_file))
-    ref_file = File.join(TextMate.project_directory, "spec", "fixtures", "#{ref_plural}.yml")
-  end
-  if (!File.exist?(ref_file))
-    puts "Could not find any #{ref} fixtures."
-    TextMate.exit_show_tool_tip
-  end
-  YAML.load_file(ref_file)
-end
-
-def ask_for_fixture_or_exit(fixtures)
-  require "#{ENV['TM_SUPPORT_PATH']}/lib/osx/plist"
-  h = fixtures.map do |f|
-    {'title' => f, 'fixture' => f}
-  end
-  pl = {'menuItems' => h}.to_plist
-  res = OSX::PropertyList::load(`#{e_sh DIALOG} -up #{e_sh pl}`)
-  TextMate.exit_discard unless res.has_key? 'selectedMenuItem'
-  res['selectedMenuItem']['fixture']
-end
-
-def filter_fixtures(fixtures, filter)
-  if !filter.empty? && ARGV[0] != "preserve"
-    fixtures.select do |f|
-      f.include? filter
-    end
-  else
-    fixtures
-  end
-end
-
-# 'foo' => ':foo' and 'foo-bar' => ':"foo-bar"'
-def symbolize_name(name)
-  name.to_sym.inspect
-end
-
-filetype, start_line_gap, ref, filter = parse_line
-filter = "" if filter.nil?
-foreign_fixtures = load_referenced_fixture_file(ref).keys
-candidates = filter_fixtures(foreign_fixtures, filter)
-if candidates.empty?
-  puts "No match found for #{filter}"
-  TextMate.exit_show_tool_tip
-end
-selected_fixture = ask_for_fixture_or_exit(candidates)
-
-if ARGV[0] == "preserve"
-  print TextMate.current_line.rstrip
-  if !filter.empty?
-    print ", "
-  else
-    print " "
-  end
-  print selected_fixture
-else
-  if filetype == :fixture
-    print "#{start_line_gap}#{ref}: #{selected_fixture}"
-  else
-    print "#{start_line_gap}@#{Inflector.singularize ref} = #{ref}(#{symbolize_name selected_fixture})"
-  end
-end
diff --git a/bundles/ruby-on-rails.tmbundle/Support/bin/generate.rb b/bundles/ruby-on-rails.tmbundle/Support/bin/generate.rb
deleted file mode 100755
index 2a8dff8f0..000000000
--- a/bundles/ruby-on-rails.tmbundle/Support/bin/generate.rb
+++ /dev/null
@@ -1,71 +0,0 @@
-#!/usr/bin/env ruby
-
-# Copyright:
-#   (c) 2006 syncPEOPLE, LLC.
-#   Visit us at http://syncpeople.com/
-# Author: Duane Johnson (duane.johnson@gmail.com)
-# Description:
-#   Asks what to generate and what name to use, then runs script/generate.
-
-require 'rails_bundle_tools'
-require 'fileutils'
-require File.dirname(__FILE__) + "/../lib/rails/generate"
-
-# Look for (created) files and return an array of them
-def files_from_generator_output(output, type = 'create')
-  output.to_a.map { |line| line.scan(/#{type}\s+([^\s]+)$/).flatten.first }.compact.select { |f| File.exist?(f) and !File.directory?(f) }
-end
-
-Generator.setup
-
-if choice = TextMate.choose("Generate:", Generator.names.map { |name| Inflector.humanize name }, :title => "Rails Generator")
-  arguments = TextMate::UI.request_string(
-    :title => "#{Inflector.humanize Generator.generators[choice].name} Generator", 
-    :default => Generator.generators[choice].default_answer,
-    :prompt => Generator.generators[choice].question,
-    :button1 => 'Generate'
-  )
-
-  if arguments
-    options = ""
-
-    case choice
-    when 0
-      options = TextMate::UI.request_string(
-        :title => "Scaffold Controller Name", 
-        :prompt => "Name the new controller for the scaffold:",
-        :button1 => 'Continue'
-      )
-      options = "'#{options}'"
-    when 1
-      options = TextMate::UI.request_string(
-        :title => "Controller Actions", 
-        :default => "index new create edit update destroy",
-        :prompt => "List any actions you would like created for the controller:",
-        :button1 => 'Create'
-      )
-    end
-
-    # add the --svn option, if needed
-    proj_dir = ENV["TM_PROJECT_DIRECTORY"]
-    if proj_dir and File.exist?(File.join(proj_dir, ".svn"))
-      options << " --svn"
-    end
-
-    rails_root = RailsPath.new.rails_root
-    FileUtils.cd rails_root
-    command = "script/generate #{Generator.generators[choice].name} #{arguments} #{options}"
-    $logger.debug "Command: #{command}"
-
-    output = ruby(command)
-    $logger.debug "Output: #{output}"
-    TextMate.rescan_project
-    files = files_from_generator_output(output)
-    files.each { |f| TextMate.open(File.join(rails_root, f)) }
-    TextMate::UI.simple_notification(
-      :title => 'Generator Complete',
-      :summary => "Done generating #{Generator.generators[choice].name}",
-      :log => output
-    )
-  end
-end
diff --git a/bundles/ruby-on-rails.tmbundle/Support/bin/generate_quick_migration.rb b/bundles/ruby-on-rails.tmbundle/Support/bin/generate_quick_migration.rb
deleted file mode 100644
index eb4fd5147..000000000
--- a/bundles/ruby-on-rails.tmbundle/Support/bin/generate_quick_migration.rb
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/usr/bin/env ruby
-
-# Copyright:
-#   (c) 2006 InquiryLabs, Inc.
-#   Visit us at http://inquirylabs.com/
-# Author: Duane Johnson (duane.johnson@gmail.com)
-# Description:
-#   Generates a migration file from the selection or current word.  This is much faster than calling upon
-#   Rails' built-in generate migration code.
-
-require 'rails_bundle_tools'
-require 'fileutils'
-
-selection = TextMate::UI.request_string(
-  :title => "Quick Migration Generator", 
-  :default => "CreateUserTable",
-  :prompt => "Name the new migration:",
-  :button1 => 'Create'
-)
-
-if selection.size < 3 or selection.size > 255
-  print "Please highlight the name of the migration you want to create"
-  TextMate.exit_show_tool_tip
-end
-
-rails_root = RailsPath.new.rails_root
-migration_dir = File.join(rails_root, "db", "migrate")
-files = Dir.glob(File.join(migration_dir, "[0-9][0-9][0-9]_*"))
-if files.empty?
-  number = "001"
-else
-  number = File.basename(files[-1])[0..2].succ
-end
-
-if selection =~ /^[a-z]/ or selection.include?("_")
-  # The selected text is an underscored word
-  underscored = selection
-  camelized = underscored.camelize
-else
-  # The selected text is a camelized word
-  camelized = selection
-  underscored = camelized.underscore
-end
-
-generated_code = <<-RUBY
-class #{camelized} < ActiveRecord::Migration
-  def self.up
-    mtab
-  end
-
-  def self.down
-  end
-end
-RUBY
-
-FileUtils.mkdir_p migration_dir
-new_migration_filename = File.join(migration_dir, number + "_" + underscored + ".rb")
-File.open(new_migration_filename, "w") { |f| f.write generated_code }
-TextMate.rescan_project
-TextMate.open(new_migration_filename, 2, 8)
diff --git a/bundles/ruby-on-rails.tmbundle/Support/bin/go_to_alternate_file.rb b/bundles/ruby-on-rails.tmbundle/Support/bin/go_to_alternate_file.rb
deleted file mode 100755
index 2ae696c56..000000000
--- a/bundles/ruby-on-rails.tmbundle/Support/bin/go_to_alternate_file.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env ruby
-
-# Copyright:
-#   (c) 2006 syncPEOPLE, LLC.
-#   Visit us at http://syncpeople.com/
-# Author: Duane Johnson (duane.johnson@gmail.com)
-# Description:
-#   Makes an intelligent decision on which file to go to based on the current line or current context.
-
-require 'rails_bundle_tools'  
-require 'rails/command_go_to_file'
-
-CommandGoToFile.alternate(ARGV)
\ No newline at end of file
diff --git a/bundles/ruby-on-rails.tmbundle/Support/bin/go_to_file_on_current_line.rb b/bundles/ruby-on-rails.tmbundle/Support/bin/go_to_file_on_current_line.rb
deleted file mode 100755
index d64dae4b7..000000000
--- a/bundles/ruby-on-rails.tmbundle/Support/bin/go_to_file_on_current_line.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env ruby
-
-# Copyright:
-#   (c) 2006 syncPEOPLE, LLC.
-#   Visit us at http://syncpeople.com/
-# Author: Duane Johnson (duane.johnson@gmail.com)
-# Description:
-#   Makes an intelligent decision on which file to go to based on the current line or current context.
-
-require 'rails_bundle_tools'             
-require 'rails/command_go_to_file'
-
-CommandGoToFile.on_current_line
\ No newline at end of file
diff --git a/bundles/ruby-on-rails.tmbundle/Support/bin/insert_add_column_or_create_table.rb b/bundles/ruby-on-rails.tmbundle/Support/bin/insert_add_column_or_create_table.rb
deleted file mode 100755
index 3614b4d2d..000000000
--- a/bundles/ruby-on-rails.tmbundle/Support/bin/insert_add_column_or_create_table.rb
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/usr/bin/env ruby
-require ENV['TM_BUNDLE_SUPPORT'] + '/lib/rails_bundle_tools'
-
-def prepend(text, prefix)
-  text.to_a.map { |line| prefix + line }.join
-end
-
-def unprepend(text, prefix)
-  text.to_a.map { |line| line.index(prefix) == 0 ? line.sub(prefix, '') : line }.join
-end
-
-buffer = Buffer.new(STDIN.read, 0, 0)
-
-table_name = column_name = nil
-case buffer.lines[0]
-when /remove_column\s+:(\w+),\s*:(\w+)/
-  table_name, column_name = $1, $2
-when /drop_table\s+:(\w+)/
-  table_name = $1
-else
-  puts "No table or column name specified. (\"#{buffer.lines[0]}\")"
-  TextMate.exit_show_tool_tip
-end
-
-# Find 'self.down' method
-if self_down = buffer.find { /^(\s*)def\s+self\.down\b/ }
-  indentation = self_down[1]
-
-  # Find the matching create_table clause in the schema.rb file
-  schema = RailsPath.new('db/schema.rb')
-  schema.buffer.line_number = schema.buffer.column_number = 0
-  if schema.exists?
-    if insert_text = schema.buffer.find { %r{^(\s*)create_table\s+["']#{table_name}['"]} }
-      from = insert_text[0] + 1
-      insert_text_indentation = insert_text[1]
-      insert_text_end = schema.buffer.find(:from => from) { %r{^#{insert_text_indentation}end\b} }
-
-      # If a column is specified, get just the column, not the whole create_table
-      if column_name
-        to = insert_text_end[0]
-        if insert_text = schema.buffer.find { %r{^\s*\w+\.(column|primary_key|string|text|integer|float|decimal|datetime|timestamp|time|date|binary|boolean)\s+['"]#{column_name}['"](.*)$} }
-          column_type = ", :#{insert_text[1]}" unless insert_text[1] == "column"
-          column_params = insert_text[2]
-          insert_text = "add_column :#{table_name}, :#{column_name}#{column_type}#{column_params}\n"
-
-          buffer.lines.insert self_down[0] + 1, prepend(insert_text, indentation + "  ")
-        else
-          puts "The db/schema.rb does not have a column matching \"#{column_name}\" within create_table \"#{table_name}\"."
-          TextMate.exit_show_tool_tip
-        end
-      else
-        insert_text = unprepend(schema.buffer.lines[insert_text[0]..insert_text_end[0]], insert_text_indentation)
-        buffer.lines.insert self_down[0] + 1, prepend(insert_text + "\n", indentation + "  ")
-      end
-      print buffer.lines.join.gsub(/\[press tab twice to generate (create_table|add_column)\]/, "")
-    else
-      puts "The db/schema.rb does not have a create_table \"#{table_name}\"."
-      TextMate.exit_show_tool_tip
-    end
-  else
-    puts "The db/schema.rb file doesn't exist.  Can't insert create_table."
-    TextMate.exit_show_tool_tip
-  end
-else
-  puts "No self.down method found in below the caret."
-  TextMate.exit_show_tool_tip
-end
\ No newline at end of file
diff --git a/bundles/ruby-on-rails.tmbundle/Support/bin/intelligent_migration_snippet.rb b/bundles/ruby-on-rails.tmbundle/Support/bin/intelligent_migration_snippet.rb
deleted file mode 100755
index 95577bc40..000000000
--- a/bundles/ruby-on-rails.tmbundle/Support/bin/intelligent_migration_snippet.rb
+++ /dev/null
@@ -1,102 +0,0 @@
-#!/usr/bin/env ruby
-#
-# Copyright (c) 2006 Sami Samhuri
-# Distributed under the MIT license
-#
-# Inserts a migration snippet into 2 places in the document, one
-# piece in self.up and one in self.down.
-
-snippets = {
-  'rename_column' =>
-    { :up   => 'rename_column :${1:table_name}, :${2:column_name}, :${3:new_column_name}$0',
-      :down => 'rename_column :$1, :$3, :$2' },
-
-  'rename_column_continue' =>
-    { :up   => 'rename_column :${1:table_name}, :${2:column_name}, :${3:new_column_name}
-mncc$0',
-      :down => 'rename_column :$1, :$3, :$2' },
-
-  'rename_table' =>
-    { :up   => 'rename_table :${1:old_table_name}, :${2:new_table_name}$0',
-      :down => 'rename_table :$2, :$1' },
-
-  'rename_table_continue' =>
-    { :up   => 'rename_table :${1:old_table_name}, :${2:new_table_name}
-mntc$0',
-      :down => 'rename_table :$2, :$1' },
-
-  'add_remove_column' =>
-    { :up   => 'add_column :${1:table_name}, :${2:column_name}, :${3:string}$0',
-      :down => 'remove_column :$1, :$2' },
-
-  'add_remove_column_continue' =>
-    { :up   => 'add_column :${1:table_name}, :${2:column_name}, :${3:string}
-marcc$0',
-      :down => 'remove_column :$1, :$2' },
-
-  'create_drop_table' =>
-    { :up   => 'create_table :${1:table_name}, :force => true do |t|
-  t.$0
-  t.timestamps
-end',
-      :down => 'drop_table :$1' },
-
-  'change_change_table' =>
-    { :up   => 'change_table :${1:table_name} do |t|
-  t.$0
-end',
-      :down => 'change_table :$1 do |t|
-end' },
-
-  'add_remove_index' =>
-    { :up   => 'add_index :${1:table_name}, :${2:column_name}$0',
-      :down => 'remove_index :$1, :$2' },
-
-  'add_remove_unique_index' =>
-    { :up   => 'add_index :${1:table_name}, ${2:[:${3:column_name}${4:, :${5:column_name}}]}, :unique => true$0',
-      :down => 'remove_index :$1, :column => $2' },
-
-  'add_remove_named_index' =>
-    { :up   => 'add_index :${1:table_name}, [:${2:column_name}${3:, :${4:column_name}}], :name => "${5:index_name}"${6:, :unique => true}$0',
-      :down => 'remove_index :$1, :name => :$5' }
-}
-
-def indent(code)
-  spaces = ' ' * (2 * ENV['TM_TAB_SIZE'].to_i)
-  lines = code.to_a.collect { |s| spaces + s }
-  lines.to_s + "\n"
-end
-
-def insert_migration(snippet, text)
-  lines = text.to_a
-
-  up_code = indent(snippet[:up])
-  down_code = indent(snippet[:down])
-
-  # insert the self.up part of the snippet
-  lines[0] = up_code
-
-  # find the beginning of self.down and insert down code, this is hardly robust.
-  # assuming self.down is after self.up in the class
-  lines.each_with_index do |line, i|
-    if line =~ /^\s*def\s+self\.down\b/
-      lines[i, 1] = [lines[i], down_code]
-      break
-    end
-  end
-  lines.to_s
-end
-
-snippet = ARGV.shift
-
-# escape chars that are special in snippets
-text = STDIN.read.gsub('[\$\`\\]', '\\\\\1')
-
-if snippets.has_key? snippet
-  output = insert_migration(snippets[snippet], text)
-else
-  # return the unmodified text
-  output = text
-end
-
-print output
\ No newline at end of file
diff --git a/bundles/ruby-on-rails.tmbundle/Support/bin/list_plugins.rb b/bundles/ruby-on-rails.tmbundle/Support/bin/list_plugins.rb
deleted file mode 100644
index 384783f43..000000000
--- a/bundles/ruby-on-rails.tmbundle/Support/bin/list_plugins.rb
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/usr/bin/env ruby
-
-# Copyright:
-#   (c) 2006 InquiryLabs, Inc.
-#   Visit us at http://inquirylabs.com/
-# Author: Duane Johnson (duane.johnson@gmail.com)
-# Description:
-#   Retrieves plugin data from agilewebdevelopment.com and allows you to install directly.
-
-if RUBY_VERSION =~ /^1\.6\./ then
-  puts <<-HTML
-    <p>Sorry, but this function requires Ruby 1.8.</p>
-    <p>If you do have Ruby 1.8 installed (default for Tiger users) then you need to setup the path variable in <tt> ~/.MacOSX/environment.plist</tt>.</p>
-    <p>For detailed instructions see <a href="http://macromates.com/textmate/manual/shell_commands#search_path">the manual</a> (scroll down to the paragraph starting with <em>Important</em>.)</p>
-    HTML
-  abort
-end
-
-require ENV['TM_SUPPORT_PATH'] + '/lib/escape' # we use e_sh in the rhtml template
-require 'rails_bundle_tools'
-require "erb"
-include ERB::Util
-#require 'fileutils'
-
-root = RailsPath.new.rails_root
-
-script = File.join(root, "script", "plugin")
-enable_install = true
-unless File.exist? script
-  TextMate::UI.alert(:warning, "Plugin Script Not Found", "The 'plugin' script was not found in #{script}. Plugins will not be able to be installed.", 'OK')
-  enable_install = false
-end
-
-$tags = [
-  { :label => "FIXME",   :color => "#A00000", :regexp => /FIX ?ME[\s,:]+(\S.*)$/i },
-  { :label => "TODO",    :color => "#CF830D", :regexp => /TODO[\s,:]+(\S.*)$/i    },
-  { :label => "CHANGED", :color => "#008000", :regexp => /CHANGED[\s,:]+(\S.*)$/  },
-  { :label => "RADAR",   :color => "#0090C8", :regexp => /(.*<)ra?dar:\/(?:\/problem|)\/([&0-9]+)(>.*)$/, :trim_if_empty => true },
-]
-
-template_file = "#{TextMate.bundle_support}/templates/list_plugins.rhtml"
-print ERB.new(File.open(template_file), 0, '<>').result
diff --git a/bundles/ruby-on-rails.tmbundle/Support/bin/rake_helper.rb b/bundles/ruby-on-rails.tmbundle/Support/bin/rake_helper.rb
deleted file mode 100755
index 2b6a455c4..000000000
--- a/bundles/ruby-on-rails.tmbundle/Support/bin/rake_helper.rb
+++ /dev/null
@@ -1,128 +0,0 @@
-#!/usr/bin/env ruby
-# encoding: utf-8
-
-# Copyright:
-#   (c) 2006 InquiryLabs, Inc.
-#   Visit us at http://inquirylabs.com/
-# Author: Duane Johnson (duane.johnson@gmail.com)
-# Description:
-#   Runs 'rake' and executes a particular task
-
-require 'optparse'
-require 'rails_bundle_tools'
-require "#{ENV["TM_SUPPORT_PATH"]}/lib/escape"
-require "#{ENV["TM_SUPPORT_PATH"]}/lib/web_preview"
-
-$RAKEMATE_VERSION = "$Revision$"
-
-Dir.chdir TextMate.project_directory
-
-options = {}
-
-task = ARGV.shift
-
-OptionParser.new do |opts|
-  opts.banner = "Usage: rake_helper.rb [options]"
-
-  opts.separator ""
-  opts.separator "Rake helper options:"
-
-  opts.on("-q", "--question [QUESTION TEXT]", "Ask a question before running rake.") do |question|
-    options[:question] = question
-  end
-
-  opts.on("-a", "--answer [ANSWER TEXT]", "Default answer for the question.") do |answer|
-    options[:answer] = answer
-  end
-
-  opts.on("-v", "--variable [VARIABLE]", "Variable to assign the ANSWER to.") do |variable|
-    options[:variable] = variable
-  end
-
-  opts.on("-t", "--title [TITLE TEXT]", "Title of pop-up window.") do |title|
-    options[:title] = title
-  end
-end.parse!
-
-if options[:question]
-  unless options[:answer] = TextMate::UI.request_string(
-    :title => options[:title] || "Rake", 
-    :default => options[:answer] || "",
-    :prompt => options[:question],
-    :button1 => 'Continue'
-  )
-    TextMate.exit_discard
-  end
-end
-
-command = "rake #{task}"
-command += " #{options[:variable]}=#{options[:answer]}" if options[:variable] && options[:answer]
-
-# puts "<span style='color:blue; font-size: 1.2em'>#{options.inspect}</span><br>"
-
-reports = {
-  "migrate" => "Migration Report",
-  "db:migrate" => "Migration Report"
-}
-
-puts html_head(:window_title => "#{task} — RakeMate", :page_title => 'RakeMate', :sub_title => 'Rake')
-puts <<-HTML
-    <div id="report_title">#{reports[task] || "Rake Report"}</div>
-    <div id="rake_command">#{command}</div>
-    <div><!-- Script output -->
-			<pre><strong>RakeMate r#{$RAKEMATE_VERSION[/\d+/]}</strong>
-
-<div style="white-space: normal; -khtml-nbsp-mode: space; -khtml-line-break: after-white-space;"> <!-- Script output -->
-HTML
-
-$stdout.flush
-
-output = `#{command}`
-lines = output.to_a
-# Remove the test output from rake output
-lines.pop if lines[-1] =~ /0 tests, 0 assertions, 0 failures, 0 errors/
-
-report = ""
-
-case task
-when "db:migrate", "migrate"
-  inside_table = false
-  lines.each do |line|
-    case line
-      when /^==\s+/
-        # Replace == headings with <h2></h2>
-        line.gsub!(/^==\s+([^=]+)[=\s]*$/, "<span class=\"heading\">\\1</span>")
-        # Replace parenthetical times with time class
-        line.gsub!(/(\([\d\.]+s\))/, "<span class=\"time\">\\1</span>")
-        # Show details inside table
-        if !inside_table
-          line << "<table>"
-        else
-          line << "</table>"
-        end
-        inside_table = !inside_table
-      when /^--\s+(.+)$/
-        # Show command inside table cell
-        line = "<tr><td>#{$1}</td>"
-      when /^\s+->(.+)$/
-        # Show execution time inside table cell
-        line = "<td class=\"time\">#{$1}</td></tr>\n"
-      else
-        line += "<br/>"
-    end
-    report << line
-  end
-  report << "</table>" if inside_table
-else
-  report += lines.join("<br>")
-end
-
-report += "<div class='done'>Done</div>"
-puts report
-
-puts <<-HTML
-      </div>
-    </div>
-  </body>
-</html>
-HTML
diff --git a/bundles/ruby-on-rails.tmbundle/Support/bin/show_schema.rb b/bundles/ruby-on-rails.tmbundle/Support/bin/show_schema.rb
deleted file mode 100644
index 621560558..000000000
--- a/bundles/ruby-on-rails.tmbundle/Support/bin/show_schema.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/usr/bin/env ruby
-# encoding: utf-8
-
-require "#{ENV['TM_SUPPORT_PATH']}/lib/progress"
-TextMate.call_with_progress(:title => "Contacting database", :message => "Fetching database schema…") do
-
-  project = ENV['TM_PROJECT_DIRECTORY']
-  word = ENV['TM_CURRENT_WORD']
-
-  require "#{project}/config/boot"
-  require "#{project}/config/environment"
-
-  if word.blank?
-    STDOUT << "Place cursor on class name (or variation) to show its schema"
-    exit
-  end
-
-  klass = word.camelcase.singularize.constantize rescue nil
-  if klass and klass.class == Class and klass.ancestors.include?(ActiveRecord::Base)
-    columns = klass.columns_hash
-
-    data = []
-    data += [%w[column primary sql_type default]]
-    data += [%w[------ ------- -------- -------]]
-    data += columns.collect { |col, attrs| [col, attrs.primary.to_s, attrs.sql_type.to_s, attrs.default.to_s] }
-
-    STDOUT << data.inject('') do |output, array|
-      output + array.inject('') { |row_str, value| row_str + value.ljust(20) } + "\n"
-    end
-  elsif klass and klass.class == Class and not klass.ancestors.include?(ActiveRecord::Base)
-    STDOUT << "'#{word}' is not an Active Record derived class"
-  else
-    STDOUT << "'#{word}' was not recognised as a class"
-  end
-
-end
\ No newline at end of file
diff --git a/bundles/ruby-on-rails.tmbundle/Support/images/home.gif b/bundles/ruby-on-rails.tmbundle/Support/images/home.gif
deleted file mode 100644
index e7d6b4ff66b7a857b7403ed748577ce1c1eb0c93..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1018
zcmeIx!D|yi6bA4~i0sBtjnqiQ8X^j&rO@;cs0cR1Xk!dyRVtMp+-ik@LQ)mUaT7wV
zqRpN{^s?L9LJ%S2MRLm!Z5>b9gJ5nM!9#8{crl)y6aNhH@#EvWz6WpN%H_FpD@TzZ
z{X$6BO+6=Bg`$-&*oC6hT*ICwLdH^_6b&%LV9r22D(rc%qhQbXah{o3Ue}<Jg@y)L
zgO+q#U>&5Eln0sxq5;u?$gTs;8wNHua8)vKvmujI>!fNEbEIoFh-EvrOwu<Avk12+
zH;J$$Dl7-uv};q|B)mzP?Qq)>wgZ^(Hs#pixW{mhw|lY(+ygv-HWO_I4rzC3pHN09
zCq3SknCK3K!??qQGZ1}A0Amgt2qpv{0X~Gk6~s`8A;1vO|M^ERaO$_mg^+@#NBfO_
z0;%87VRa&<+2yjTq|I>D<zDxC(-_^^QWXE`P(7Has6PMHYG&?Qa%1dRD5pN!O(wl3
z5|v?mtF%6|+={H-(%j0cU?fV>zOOcQvnD25?uDnm*xARfH@oS;<c-(w!mUnfQ}vyx
z%s#(#a6FPNKe(6vK{v;vo!pn7+eT?J`SoG!`p)N<p~d$milb-d$@|KOROjRVi?@pz
zPf!oeCIS~$KSi$YRg5DSpA1r&=z+20OWWE?sk2uN?D%Sp?;h3P!?8otrRBSEbp8+A
C^d<NJ

diff --git a/bundles/ruby-on-rails.tmbundle/Support/images/install.gif b/bundles/ruby-on-rails.tmbundle/Support/images/install.gif
deleted file mode 100644
index 2f1ae91ad8a8dbdb97dce8fc4475d8ff4fe556c2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 763
zcmZ?wbhEHblwgoxc*el+=g*&CzkdDr@#EXKZ=XMZ{`m3Z`}gnPy?gie?c3L{U%z<q
z;`#IE&z?Pd^5n^*M~@ypeE8tOgZuaI-@AA3?%lh0?%cV3`}WP7H*egyasB%Bt5>gH
zxpL+5<;#~YUAlPj;)M$r&YwSj?%cW4r%#_edGh%2<42DkJ#^^M!Gj0)@87>~-@d(j
z_wL-ebNlw~+qP}nx^?U3&6_uE+O%=w#tj=btX{o()v8r1SFT*KV#V_1%a<-)x_I&8
zMT-_KT)1$-f(7&E&!0DM-rTu!=ggTid-m*Evu4elIdjI08PlgvpEhmU)TvXaOqnuy
z^5jXACQY0;vA@5+udlDSx3{OKr>m>0v$M0KqocjOy{)aSwY9aWsj0ECvA({(uCA`O
zwzj&ux}u_@tgNi0q@=L0Fh4&(FE1}QH#ajgGbJS@IXO8lE-o}QG&nfe*VotE+x!3j
z{|uA?#h)yU><n29Iv`^}al*j<zadM%xuvzOUB8K;yQjCWpP`v?@|3C5rZYA(&7L!N
z-h8HJ=EY0c13Z0vf`k1dc$O?_X4$-j&zWC*r?{Yn%$6<9tcMN@xJxUZP?WWkJ$$&C
z?cyaNFD13>YRXRXmo7DPJa{PJtFHA-OVdsE;lpOm_gq3k3V}L?-wkzr)IM>)=WG_?
z;90cPYpSwQhDM0RkuFgk9~Lc%BMTl))wL~naAV=(#qP4M+bUL`NC;@2Y<a07(5a=P
zU)H)oq4Q8G&ny*nX`Z43mmMb=N3XGvd~~>7NGI{ojD<oApD*ADSg53F%*xp>Wm=&z
z(aFs#WJR-Dhpe<qPp_y(z>WnUm!7<_u{lEP#N22`kLf~^MiWkKYI%3ZQH+V3?~O8d
zD|^rs9yuG1=EukT3u9&)v21$kC}os=uV(S_XXmBZ3MG7ZZFzZFhOIK<?5?e^ugkGD
V&hXv6?d@#^A;nw09=-|;)&P`hYK{N^

diff --git a/bundles/ruby-on-rails.tmbundle/Support/images/rails.png b/bundles/ruby-on-rails.tmbundle/Support/images/rails.png
deleted file mode 100644
index 995a823260cb25c790a512b0abbd358ede09e134..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 16531
zcmV)QK(xP!P)<h;3K|Lk000e1NJLTq00372003|Z1^@s6Yhmo-00009a7bBm000XU
z000XU0RWnu7ytkYO=&|zP*7-ZbZ>KLZ*U+<Lqi~Na&Km7Y-Iodc-oy)cUY767Czti
zWe-+D*zmEJY=HnGBdiF>5Lu!Sk^o_Z5E4Meg@_7P6crJiNL9pw)e1<Rh~l6qxMx9%
zh+2zPTsZC@+^4mDdhhM+``7!t=bY#K&Uw!dfDsZVk>;Xm069{HJUZAPk55R%$-RIA
z6-eL&AQ0xu!e<4=008g<d3b(wus{3(uWtYX0C3eVBofEr|AV?vCRYF;kpSQ#66Xs6
zkWv81E>y@A0LT~suv4>S3ILP<0Bm`DLLvaF4FK%)Nj?Pt*r}7;7Xa9z9H|HZjR63e
zC`Tj$K)V27Re@400>HumpsYY5E(E}?0f1SyGDiY{y#)Yvj#!WnKwtoXnL;eg03bL5
z07D)V%>y7z1E4U{zu>7~aD})?0RX_umCct+(lZpemCzb@^6=o|A>zVpu|i=NDG+7}
z<RYAxn<EoQ=L1a63;+Nc`O(4tI6si*=H%h#X6J10^u?n7Yw&L(J|Xen{=AF=1OO0D
z&+pn_<>l4`aK{0#b-!z=TL9Wt0BGO&T{GJWpjryhdijfaIQ&2!o}p04JRKYg3k&Tf
zVxhe-<BLB3GvROGi+=X}Kpy_vdhh^onn0PYz@vlxaba$Du2PQY%LGC(ZujRS{>O!X
z{f;To;xw^bEES6JSc$k$B2CA6xl)ltA<32E66t?3@gJ7`36pmX0IY^jz)rRYwaaY4
ze(nJRiw;=Qb^t(r^DT@T3y}a2XEZW-_W%Hszxj_qD**t_m!#tW0KDiJT&R>6OvVTR
z07RgHDzHHZ48atvzz&?j9lXF70$~P3Knx_nJP<+#<bWIsp%|7y8C1YJ*aWq(0~(+a
zn&A+%!7(@u=im}tf$MM=24EPT!Wg`U2?RmN2oqr;I*1Wsj@Tm32p5@-1R`NbG?IX%
zAnAw{Q6k02a-;&OLTZs+NF(wsauhj@TtNDe+sGg?iu{VaM=_LvvQY!n0(C&Ss2>`N
z#-MZ2bTkiLfR>_b(HgWKJ%F~Nr_oF3b#wrIijHG|(J>BYjM-sajE6;FiC7vY#};Gd
zST$CUHDeuEH+B^pz@B062qXfFfD`NpUW5?BY=V%GM_5c)L#QR}BeW8_2v-S%gfYS=
zB9o|3v?Y2H`NVi)I<b&gMyw|8As!)~C0-{E6JL`^Bo4`v<W349C6F>n3rTB8+ej^>
zQ=~r95NVuDChL%G$=>7$vVg20myx%S50Foi`^m%Pw-h?Xh~i8Mq9jtJloCocWk2Nv
zrJpiFnV_ms&8eQ$2&#xWpIS+6pmtC%Q-`S&G<BLK&6^fO%cL!%)zF%0XKD9nFX?o;
z3EhJpMVHW*(rf4k>F4Q#^mhymh7E(qNMa}%YZ-ePrx>>xFPTiH1=E+A$W$=bG8>s^
zm=Bn5Rah$aDtr}@$`X}2l~$F0mFKEdRdZE8)p@E5RI61Ft6o-prbbn>P~)iy)E2AN
zsU20jsWz_8Qg>31P|s0cqrPALg8E|(vWA65poU1JRAaZs8I2(p#xiB`SVGovRs-uS
zYnV-9TeA7=Om+qP8+I>yOjAR1s%ETak!GFdam@h^#<Ae=IoX^_&LPeX&U-BbEk7->
z)@rS0t$wXH+Irf)+G6c;?H29p+V6F6oj{!|o%K3xI`?%6x;DB|x`n#ib<gTP(_`y-
z=?V49^$zLX(MR=d^rQ6`>hIR?(H}Q3Gzd138Ei2)WAMz7W9Vy`X}HnwgyE<W%V@fh
z#Au_@NuwvYChmu4<285}K4z?M9Ad0A-euftJYiyKGTWrYq{ZaEDb18?nr6Duw9|CV
z%*ZU<tk|r{?2b9roNJz8zS+Fn{EdaBMV!S-i#ChLmfDtl%LSHAmiMffRz6mFR`pib
ztVz~f>n!VS)>mv$8&{hQn>w4zwy3R}t;BYlZQm5)6pty=DfLrs+A-|>><a9f>;~;Q
z_F?uV_HFjh9n2gO9o9Q^JA86<b<B2baJ=iJ;WWdk#HqvSS7#e%p>v({H5aB!kjoO6
zc9$1ZZKsN-Zl8L~mE{`ly3)1N^`o1+o7}D0ZPeY&J;i;i`%NyJ8_8Y6J?}yE@b_5a
zam?eLr<<q3^N{B+UUpttUi-ZsPqUmRp4KpJ$lJtQ;JwRxU^+fMW%|zP13tz+0-t)H
zhrXu1BHul}BYxI?nSKZSp8Grc%l(h|zu|fE7V%C6U;)7a<pI5c8iBI|YXctynFOT=
zH3f|Yy9O@|J{3X?2@P2va+7bs7xEkVV>8@mESk|3$_SkmS{wQ>%qC18))9_|&j{ZT
zes8AvOzF(F2#DZEY>2oYX&IRp`F#{ADl)1r>QS^)ba8a|EY_^#S^H<bj`5GFjJZ48
zYPNEAXRK;$Qfy=Fo4A0us<?r8hxkSDmlAXnBnj<_<iyy-J&EIU0_SX+Go0j_RF-sO
zuI1dKxfkZ?&dZ*6JXtkakbF3Wm=c$=KjniULQpRlPvxg>O&t^Rgqwv=MZThqqEWH8
zxJo>d=ABlR_Bh=;eM9<ahEGOy#xn^|QY(3p8Irjp^G#Mn*50ho*>Tw|Ih34~oTE|=
zX_mAr*D$vzw@+p(E0Yc6dFE}(8<U61_v9n_bMxC3Y=unGqqI`4P!1MMFQ_YcTNqn-
zxJbQ7TGTV&X8!8=BMX8Se7%scP`I$O*tmFE@!%rAMY|Rwi&GbOE-_tFx@351@X~$D
zXv?ye{ZQgqQdRP5dED}jQiIZ^r9&%%S2UHWl*!9(uJl^DV-;bQWL58Km(^QVe<~N1
zU#xJfsIK_1M!4qUS59BmeD!&4+S=Yqx61A7Nb98QZmjoNzpqNYYC+Y|hVTuo8}W_h
z8((co-gKdQYW0rIw9U%R12tha?OV*YtlRRTHly}>oqt`+R{gE3x4zjX+Sb3_cYE^=
zgB=w+-tUy`ytONMS8KgRef4hA?t<Nq8e$u|zvh13xJP$S#h#CQrF#eVMeplsbZ>0j
zufM;t32jm~jUGrkaOInTZ`zyfns>EuS}G30LFK_G-==(f<51|K&cocp&EJ`SxAh3?
zNO>#LI=^+SEu(FqJ)ynt=!~PC9bO$rzPJB=?=j<Jb;mW2SDv7qC_VA{<bspqr(~y|
zolZYJ)S29Q_e}hmYh6)Yy=Ozuo<A3K?o78|_sR3#=Z{_Rym0g)_hQ>6w@a-(u02P7
zaQ)#(uUl{HW%tYNS3ItC^iAtK(eKlL`f9+{bJzISE?u8_z3;~C8@FyI-5j_jy7l;W
z_U#vU3hqqYU3!mrul&B+{ptt$59)uk{;_4iZQ%G|z+lhASr6|H35TBkl>gI*;nGLU
zN7W-nBaM%pA0HbH8olyl&XeJ%vZoWz%6?Y=dFykl=imL}`%BMQ{Mhgd`HRoLu6e2R
za__6DuR6yg#~-}Tc|Gx_{H@O0eebyMy5GmWADJlpK>kqk(fVV@r_fLLKIeS?{4e)}
z^ZO;zpECde00d`2O+f$vv5tKEQIh}w03c&XQcVB=dL;k=fP(-4`Tqa_faw4Lbua(`
z>R<o>I+y?e7jKeZ#YO-CHLyuUK~#9!?7exAW!GKj`8ns@`_|kuD=V`qYm-!}l1e2B
z%aSdx@*?9!?Z7rROw-UEZnJgAFtmX-)25lB8=8&|W}+EKKtL1pbO3|dYz!E@$Y5iS
zv1D7;Qrb#YrCPHpt8#srZ@c%N^P4};z4zVsGP4%2i+|=-yvlq_zIX5U{?2dt{+6SD
zdSs3*ZW<T?J_I}hJOGsV|8F;Pv%wZm)`5Qx{30-}P=KJ6y6Pthpj7&wy3Vhcf8^7b
zfdk0SQEhQ-gYUh{vAguWMQ{~xEAW2-@6bw7(u#?ap=LA{tq7FDi6H4```-lzSP|+w
z>+HIBhU!R&v(6t+c2LrPKq8VpC*b-Is`y@U(tkqP-{F6X6h3Rq_w`<v;`4ofC!iFn
z6cCQrP^AFZiE&+v?OI%9aZ!TnTBMsm$3ojdWWhQRM<!7k_|obIPNWaqTY*P`ePyGW
zsRT>}#-DV0<*Yxt91oZOE>JR5CPq-}mTsp*I9W%93Y_W(DLok_Dm_^RruSS9QhM@A
zR4zGEyg-HLv%l-Vm<pWub51Xw|E%8UD9J!Is6hL*+=(y>L~BGl(CJE4D!psa4l#<}
z5>;CYbWl(Q{}tF*4KxR9B?7IHR7%Ny7J&6Kn@X^P>f{i$i7}isp>463HVDTmgd=5y
zB1ryk{mB(2OXZKV@9TjrNZ;!{sZ#~uv){cSYE-G@r7Dx~IL0M5{~Q$<bTtG77yBz9
zofsD<sB#IVmA@N}(hg-5VgRFhcdNG55gE8Y2)rxQnuE16fl@iJefI*eE`RI@>SgLX
zC(uEF#M)nAfn=qFZFVV7)iJeF3W)TUawd7Gf+|RXEQo=Kpj=NjMEZdzTLqcUi(;y~
zcXQ{Dew3)Wj?#vBV~wRJzQXb|PY|!J5{y(K)DSx)@e(RpL7<UNgwm-rCl<6qnG|TP
z5hEz$kU&9_uFisLD1tiz{E||NUDeP7Tad~k$eV!`oKn;#hp7$^;jF_61lgHt5G!;p
zt`m+`C{2!_0+ULz;GCnNICDMf3c&ki@1;zfLsTlk1Nu}I^e`A)(xtt0i5>U8F+bUf
z+wb9I@G%yj{0gQLU=zQ*m1vX*N@-ll;G!5w5-5czqtQmNN_iDw3O|j?tT<a)aSePB
zm?&w*WT3YNRtm-|vjYwx9IY_4W1{fUo4-T_8oSY@eQuFxy^S^{bh%DY86qgxF{K)&
zR7HnXR9ME8%9tQT8$(#FQW~3J__jL<Y87<gB}xSf6)1F|(V@Sq^lmC4wzbBU$3NdM
zNkij|9=;nDg3=0YG)gN7{4pw{(1Aji4APAuu_&!m$<?{^X5gv}V7B&<0^kvaVk``R
zg47NG>jr@phYB^d9b;67Y9w)jRs+6@sGeJ+{Z&pD*Ko}?<sDOm^*R`XSV7^u(UYD=
z*QFBUcf5kRH-8`D=nh`~vtQ%NV}Fgfq+q;yQs46&1W6Lw3ujq9@h!@uQ#kQfU73*5
z_%zAJ8d_@zH7>z_uhJ+qlr%|_Ac^%C%qY;L`ZohtLm&_+NK(T?ziJ48SEFF0D7A7m
z>Gc=DDX2`;8JZf$Cdu{twZ<T^rG0LmWPF(F&RKM+lImUSzr$JTvwN9&=)H{Ha##N6
z``-B>x{H@tKl2hQ1yyk1{7-QXob?x`Qbj2^_vzn8#A4$%F76;U0%b6jDiX)2C_&?}
z2ugzr6k;^G9N@YMPASSec3|6Gx|f!`kOm5|sniDPPp7ujxm5*JwaQ(tqGuolmn)NO
zCxWhp)Tbv1OCdI~ea?37>ZpMrqo^uEgWYJdzHy4$><p!e9jKt}UB0Nx)O`>20Slmm
z68qo%Ax?b!SBX|v{4u70f`HbTQb<@Ip)$RT(%23N0xy*=!6gySMo1EaK(x^yTE0xu
z>0&!w#5t1o26Ve9?ZHmg*4h1mA7p6nK~8=Azq9h}afl;-az^DBgE&3mf@KXd)1Xzh
z{5=#d_qF>$b|P2>Lz6=cPmJNL{d-17{!6vibQUfXZ#1dR?j{%-!IZ1afBsK#QN;9p
zZw9S<2V5Oy{LcHi^7t3MZybb}av5DJQ`@<l+Ma`q-~I~1;fWgvR3p|-KSyifEbAwq
zp?U6QI?KyMs~f1bCatq4+4Hs!@T&jxAWwhne`n##UnN@F$i0l*$hm&E%)F*N^7Be5
zJzWlZ66+UTF0sYmEkbFe!r1;@gn{XEfs_L6VzeaQ2&AEK7CNic5zh>47A`9jfOT{i
zmk|+yYMr1`qj~-m;p8;ciJbtnE}!Gl*FMMUb59V~hbd3aFm~u(W?uI$cE9=kj2*t8
z`mS3r<?4-HXl<xW%rLy?5R>=3f!Wu;o67V~6c&f2HGhHD!dZgRarVFC1E6D8UwjVN
ziqead`l!~g?K7PS0SSuXsN@nWn}GGtJ20Bc)Ckpj6_?m+OK19dDqAwri{bOYKm;`C
za!9<gLcH3bJ~u~sa+<}jehzIyB#yZJwa;TaEr#~pPJQofOyBpW?-=c{<KBnZaqmMk
zFP~@r(LZ6~@vpM-!t>0%?OlxDbsypIpAs!?<Uxj*EQ%@kO+P&{muRKTk>PTIH|Y0e
zbDtKWJXvSwq5TBL^!(9G02BmC6Jy(;Q#VJaQmRvlO{1PHr1XxtK^fzJDg)Xe)=?T6
zrMhd5pf-dKLc-ArMi1Y^#GUv5qwqY(e)E@De)3yXcFwT+^z+0kEhKW#wMfT8*P>&`
z->x)pB0W~D7m4+|T+owVRSKx@oS;++NfP^QINbhV0Vjy|OG||TNwZ1gh36PPc!-^^
zdppw)y!juMM7!%pKFaE;XF2h^zkxE^3y3a+!@A#N$aU^i*=zzfQxh)L!<8LFOwP^p
zGgWM%b6uu$$sKHk>QRy?dM_!@189HuI@yP|ItUoP^&m5^e;bqczKZshm+7v|BhEYb
zI=J~1b7g#*U2l8`(4~2Ko@lAz7oh{3pc3IsySrKEZUt=adeuve%<jNwjkWHY0_iV@
z+RXV1Tl2kAc!P83a)r@5kFe|E??IOXmX1A2d+{tvgrGh~WpXdo9k)=bk7BB0Hyz|#
z-~YqZ=Js>qcmF#pPaO9SO&+oJ6F1ueYef*Hs7{SAGB!dIUq`^81SJ~Dd|d$-MPM|h
z6l{U6|5l|_!x{vP-F1YSH@%(C;)}$s21+S{>M)4IMlIIQJwxl_i<Bqks7&pnJTgOR
zWHMc+*MI9QFOalWh?{HaF;o!ia7owOky44EQlm04OE}bj5oaHKnA*%9p8l2p$m(Oy
z`>zi4W^lKZ*c9|&xXk$M6z+N>u_Acs2anuw7#DSEo;&MxYG8Vjnvx=MyNl?6iKBNh
z{)&5OUp@s0rc?!Sh&T|14$Izya0%_pr)Vy`M0I>O<%vC%Mt4#fn?;A)yJN1~q<Q%~
z?JMVLUpz_s@&(#U7tki4RGG%MW0KYyHi^)c5T%6j)HFkT4^!Q_kBK|(Lx&XrMh_h3
z?w|TOp8hYtz}gchz$Tk@?nJ4ebMx$i17jH5w}a8i@oTDsp3aRusjNKtJbL61M?U<Y
z8N1^iqNNLTu3Sc}!;}mtg^exk<rbZ#He;{2i@7(w#j|0#e)cYhQU$%OGF=^@v>|D&
z(Ox`5cj+uH>0qNapfKfH57Z>4b@?1?FFwJ_Gk-_x(rJ>`I=0(JYehITMp&Id1!Z&)
z<h(^VI!e60#`?=I(m4JM&9ld`aYS``7s>=w#&^(JzR2oR&q8E5v(`pHa&X5>CRGiR
z{}iPtPu7_^Fn3*%SPrg@L2GQQOLcB1w}0rvj2^gy>eMU~cfX3Hy-MrSc{(dCqDDmP
zQk&+9btYeZm_y(90Wd)t(xw2aeriu;Khw;Bck>L&1c*!MES;yl_%iXvk~e;V#sr4-
zv!_^l@d@I_GL@M<jNWz+;pi0c`VuyYG35$cSJR6L*aTfEbLe0Euk3o`dzpFdJ6U<*
z8(jF@U$Xkb(=;!g#o3th_!KYxkKd$wX%QTpS#2RwG-ya4ur_sv#&%7keeiMJNk0)F
zv6y;=xp#gKlSd!)lH(FgwZbjm|6}NpIwybUPuO^VnFP!98xL{&5B*bAspJV29rURJ
zPmcQ#Q!-#hrSDNFY)VQgj0zA*h#T{)uAXD<+$wP+qB=EAeP))?!}l?I+dW?AE?uO3
z@nw?M2HJ$Vx1xg*I;<dA7N7hIrSVDsoi3&{HAd1{<LoCs#lqJfWAg61S%2Y_w=rgO
zCIVXk)}>-tof>9jd<1*L{DELQ33Cs>g#+*TVVsRgnybX^b&}>X;u2<G`&Q2V`4_NU
zVf^R}cmBu+sf<tIx^1-9IG2XYPN8rqndf!0LgAdsB^zf^8k|xnafq@QQ^6()=fCn8
z=Rf-d-OF9Z?%B!6fxXN;ut;falIqkPmC0GEJNMC9IFB-=)F3*PG3asy*KM)*_!n_e
zn<Q!yH<nS#p(`aS(;?lZ70!O*Gw5;%fkN3Wyag!$>qH3ZB_{XGfO9tpt3PR7GISej
zT=~}DGIGm7qUH*=wE;kBVww}b`&+C&b%yG`5f1(E4^r7NgNr(#jh9r?)QR>Iszs%o
zZ2DL$5RG#dt$ir%-=oncK$3)WU-%klKKXT$j>Vu@d1`@`rxsXx=0)P>3j5yi9->AE
zln@M$po20JDW7mf`^PqcsDn!^wi|;29U7b!v=hR*zaTEMNFtu+-3r_cSW$|hnF(su
z^0j^1q7_yeZ49m}*p6`SkH5&`H=kzq%?~m6j(1ZUn?wOiPkocKfB1PMvK;*WcQba!
z-QW@*M2Je4xk}Z6!=->Kr%<Z*80Y-8a6NsjwO@4$Uw?`-fATmkas+5kC8u7@#>oaR
z|Ji3)dhQw8mm5^4rx@Ko$Jl{e5j3vbOha~!4$GKw4M|m0lJdqna5yKJl3*i^BtC)3
zpycMdHob?V6((k;aMuHDmRoWHaZIw&MwUAy>lW!+)}FjX>%~vfc<BUt9(ja`qp#rf
z$N!Ml{2F_|_qEJC^j4G!yunlfD2sCbGbIPr^~ehp+IiWMRC>`CE!qb=N?1OAoYSB9
zTS$6=Opy#UXx5%tX62csR7THGzwIT)51(S{j@zjWjUzTdsQ?`)Buvmrj0t0$jgcgR
z(E4!QS%R{{MQL_I%T|7_kHjR<OzfGa9EK!Y>Dpor-w8w!#4##KkWLr7+(y>pl$6l~
zXly&?;-7zm*30wM_Rn(V%g-`;be8?^{a(W1QEa<~HU>nzF4ZngI%ZO=eTqgbB0fv&
zlZp-}4lN+!Fvifna+#AK{|q|N9QdDJ!|6Z#8WPJ^nY~<+1z10^#`?);AnY)A|502b
zh%KR26&+MCB>`t~HbIgIu`$Xzlod?bp*voBWh;Z`Qt7Qu4ly=4-VbcXU@46_3+)cX
z33R#;#lG@H3odfdv3Y?-<~?X_Ks1eG7g;_wPi1G7+kW8t7}|FW5=UM~x&)M<@qmg`
zpj=+a;Zl!5iT4U5O?BwhgFqW>x5L@bev#;MlOsR%PZ_)I7Mk-{xcE263DAAgJNSEm
zCJ{&T{4(7;*Dxi)brRyFj8;{^fKixI)dTDj#3qOnoD+hY#&z}9I@bY|3_JGhM2Yx<
zmK;zAtv1r?LaPhi1c@yq&R5kKjSE$e(CH)Om0v2N&^AC5GxyFnF!kUYKzX-{G#Ef^
z`d;rTIG27u4lM;WflCvb&i}nuC?%{Oe~E=hkFn={uVLyHuf(pevg@H&v-aWzy7R5v
zLmo^!NuCN<tiQCz#?e(K4(-N8YoMFhxPi3+$^{4-6$mCQBXNXt77~RiD|AKU65W?t
zPr((2XU7>H9Y#`iidGxBvIJ)@BB!q)FE1nW>&R*sqO_0#<qdcuK97`UdD8&RXH8ST
z)Dkms-+t!a{s>`x2(ivfb<T+SXbU{ItBvulme$^j(EfSRCV#I|8Wn^jorrUP^(B&K
zOn0?`>vRCc#Nos2edmK$3()i5HHvsOrg7#nHWq?%6=MQ0AzC{eEu1tE)xjBus+7>B
zGP-0?S`pTK%0Ej61es9^MypKknZ<21k!Bm3ZKN5)Mx451S#C!AOXBnEsg!!lt*qp4
z6G_w2X+|0A2*=9oecwM}?9fq?Zp#znN>UY@=~{(0y$Tl5sf*>D|5~N|0?&d6<q#XQ
z^z_p#KYkX4;>zDV%kZ8ru<t$ZC0SWQmrALVs5aGese%+s>PxSmSfYJ&jp5lzR2*R>
z#yX8L0U|D?1=0wTGDc}oG3bb}>+*{gq$C!j<r3xj%h-)Bv|>oyK%rSy_#nOds4Pcj
z)2K}6K6u}HQ%aGzgxzm>71IyC$zK!k7fHmXzO76B)U-%1b-Qq0614K3fw-RUtHgma
zM9n7WKJ^9fxQHTYM4bPtuQGPz2$IB{{foctPrsy>TyFx_OK<x^i}iC?7}~W1Q>uV-
zNFX>AA{ylcE!szqfx)5B%0LiM3QGA`1sQf~t%GaC{b2Sjo??-Q^y(k9%FB}^<1&@x
zDnYcuwJp`X<Lr9t+o(?OCTXqvC7$NcvT8;VK|6~m;{gzbN~PH!WGcO>?iEo;60`Qg
z^E95nj82o;3Pt<nHIDz*?@`@3N$c!7ftb87G7ELsMuJ@;G)^usad<zKks3CR{DpLa
z)&j-{E53fkrs1*%0$gM_8?-2~M1i5C)YWT}Gm_RxDy11^NUvBfE#$*^Qo@O4=Hb_}
z<Nh~5lAyKmPI)So{=iesuZ=J5)a22aIM?G6bgDAa*KFKk;VX~#Sy7c1(5!uPp7rWw
zg491!(qDZ_o)eKi182}|9ABe#{~EQaaa6aA7Vp<um)a5SQuU>A#;Yi8H0>)*3Z-&A
zZ(+?Q1KESEv{Rwr&3X?d_kA<9pi)*|6t0^vde0oY-uiY*<5Rx)PU&81M`_P?q{hnM
zb^2KMKc{+0%#3b~TWuB}dl8emTK$Sl;o8YH1NI)sy}wOb3F~Jr5_ckkausDtXr0!R
z4b+TjqtR(j&8~Oz!Vq2jj;6E3;<iZ63;>)}6b7J58r4^_pBb`DgE(g1{5q!Yc@4JH
z?zj9(=fEi)^Z-u5N1N15%YfDCV^1%-#IpGH$FUo6PD3&v9xDIWmng~a{j7-U^Bh*6
zyh!`<8oFG;gk>;+2T`X5dx6RyE2D_lJBXFdu2>dGtlA`%fot#xIBXR63`|O7=OAl^
z?Zk|}VlO*i_f~@HkT(Q6@a|U;y!_sKJ_lLr0jcguu~^IUlgIL6mY(De0xEr$<a(r7
zqv%|2)11GY`nDxhP(mA%1L|GKR8~SwwAAdY;VOnwJ`A*p=W?&oT_IS8kIb;|U%rcQ
zyh^m(LL%Gq9x~y!!puXjW%9^<DdQF7Kx%D#m0>Ey^r--|2~aYrP1T4phNQVc<6CE$
zdGisU>ZVt1t_q7?T|M15Ai@1oy!zZ(Ix8EPO3h1e5c<+nqrG}CJ}R@3=TdsaegWJJ
z&RAp%-P;3L5X^9i={LWIJO1_0a_=wyBDeml_fp<HLcG$(H4`ujX(tTbyPF*kyaAo2
zT9i(8Qx4iTQk-6dT#5@iI{RB^9jh-qhixU?@nb*E!Jl}~CP7er+V|S3V(@&8Xx3j?
zrFrp+7mT2UHX+Ic-k52xe@$qJ*IJvzHQ2n|g{35B%mmvk9HF#xgy}atOl4x4nFk+c
z^635Se)ylTa_n2ofBthczI7Uj5~d!wmx;UX$BCC}txaZTygTK*e%Ic=!sQ-<^U|7S
z8gwBOA-;xJl7yuvo}_kgg5lflpt55cal%W#`iZ<1KvXfr?S&AsjX$)>n^53lN8`jf
z#&6q)DOC|?an7QgMVpkObwaY*F68|-f!q7at~l15WlRStaoi7Yb?;6lj`T{3!l5yy
z?tLv&_r4Yvby@rBNvgL_F!{;{3F^aML#r&hFlna2c?ox(;pznuE(cM$G$QPC+tO%7
zVD0&rnR(L#h)qyIiT&U60nnOLzws$-Gxol7ff<!e&evvsAp<!B*ob2FiFu}9xytDN
zT}a#|2+JhaqMSn;P1I=Ntn`Wxw=!s|kn&lKqb(GJBN#3-cGnSt+R&C)KU!NQP9i4m
zKg!I5Z^^$#2Vu(B>Qsuo-pxFKOeN^_PR1#u<dN0|gNLTGxIpLSWm@wKm`V+$G^SEz
z`oT9)zkLUyHXE`2-_@4<!X{m;6wykTwUg&@u|<UyZ`{H%${0*JAYN|y&(>Mn*B0Ow
zyLMX6u_1QA>lMno#+Z4_JGKON<@qOAdHNYjLuJPAx|?u#e4u#Qc-3Hf21@I|=c|gk
z*rd8Rb<ey$E*Lj~jZ-IZkz?sA&+^nS|2(Qx#*`{Z645!g;-M>`sbs5;Cbh}G-4bMA
z?bvBLt4&O~f-)t7(0dOyO0b<cUmi+tBe}(IkHv8*jtB<CT$hcP!YyuV$B)tY`bkFa
z+0W#6y=t3USPy7sz%nV$>JPN(88)L$Pl`?E8yiG~wU<w!QMlEJi=X^Ep7`j$C2nod
zJad}P;)drURDl!8en=0n{wQrb$bH1NesYD@C2!bFP(qoIuu>&zL_QkT^!g>X%Apmb
zFek!VlCTjvDrrcp0z-Fcop1fzzooisC$n#TJNw@8esrY{!1~D-iJD!;@4cJRgLhxO
z-dG#ZX%;tanbKN$Qd}!UrG`xfXmM$l!uncRaWq~yk#^H)q+?n7((`=t-~BALy}MGW
zRXu*gsY0Pzs#7<W)2iGb+KdJe!|HP<7(ck5pi)7c#Uj}Cj^{@5LT~z6vF&b=I4&m<
z2TBzZ5md=L&)tiwL<?&)PoCrSAN)S!cOPN+;2o?SdyeY9QAQ8ng)Wt^r=;8ax;Rfd
z<2<{RW_3MbF1ZQv;CmLJb73(r<CIW?6ITE36pd%jc@9?faLSFDWNcoK;FAKWpy>5|
z4C-QoX63Q-%)Wk&;r(+c8<R8|*eF3Og-z>@MXT*xvHk{S>l}-5#B5L|GzwJ>y!eOS
zTE}Z`;?)-2g%vJ;=`o@!8;n12h_NHDxWTe{jn)*Tm^7!RQP`9P^C=$<pbXvf>t1p*
zNlcTZZawyTPsoj0-uzOO;tXWzaZwaF-G2Wm<r~@w%g>*rHaml<)afq1h*+EQDeCGv
zx7akEDd@JfEZUeL)ac<LT}tT(1qu~vBucPrZCuwfa_}}r_ul&VD9Y4nXq<W!DKW3J
zs4fdKL|8xZT#uF0z5WWN3tf$>5Cj+eEv2%m7*(hpE=c(%U0ei9vGUCmM2!tk8a11~
zfFuor)qq6|HqA>Iu&A*J^GTPz^}0|0SeJi@Wc{}qTx_Ww7-!_ronXShf8ndvsUK|9
zdNF#L;Z!enS6BLcO3BjMuAnC~U666bs<1K(Wk+IFkAIf_<eK!U3jcfSOoQh9C6q+|
z_;gRzpxNHf-5gG&X=i6St1MyO7O!&0T<P@76GwI5F2;_$^4n5e?74?QDb5HTm3}XU
zZlNCK*;luh_GPG4l5>kw09l!SuYy!)Hv7Q}<>2yT$5=moCJpJ+d|_4*uLt~G$yu?@
zuAl;vlyAs;0E+Y?X%N-5)aT|H-FN%9uY6ml!H4M&K9uqlUun9IbZws6>jRmB<<1IM
zvZXtqDteNf3612dc=J>R1+MKcN}<gl=XbTv|3F`(6~wQ4D^$Be6W8mhD1ht|OJ)B!
zBe&nt*O2$^!`PsMH26@y{a+6S9R0bEaOeN_<LFv|#I7IY0exIVTbThV&R))DDbQP)
zgHo(e)c21Q4wZWS8@gEAu|<R?TY&4t>!P6`K)ROIc8t-waIop!3gw-XjNE$1cd!dV
z=Ui}Bvm1_#aq9<um^b{<$JzHU-kBy(B{ycp>_{Ki+;`>!Y9a$!XH}GvgRDfT?5k25
zs`<upZPK={0-vp~qH|?XYL#Ll2(huFwGq)t8}^EN%_WZ7t{JB8e(*cr>7h(-`3vZ<
z%+Ty!?)qPTo>%|&#~6L!7F^pF0No67PVO7kFU7gdOC@jsWQQ<(coI`BlWepwr65o5
z6npNr<raz$j8Y7lfU?#o2gycEGqJvWQ)h0B5Y$6zyLNv^RKj+}e@YcCv+t7_KYR}}
zuX`PmPWND-4K_RDTrhMVA@uvIc@tg_WDy8QLc;MOpBs!Fj)H+#1*6snZZ?r)z++Ir
zXb|LXh)o>p%?QzjEU$Hxrbih%aPa2!DQSg7meYUqyIg+kuY2Tnb%@H$uCyIC^AuFS
zA6x`kijtYBgMw}r>EnTGheio2B_we;>qt6L-YKf}z~^7JuSh8>+ECR7CEkHni4d>H
zY&c1Y5kGaQG&VwQ*S?zstY+$!Z^Xrp%U}39-}uR&;jy3k5EsAv8C=w%Iy2WFSoBR+
zDyRiizZ5eFa>h^i8Vwz2YP-i!L4b=bVg=id!I+-v$v=CG@V7VuzyRZ6Sg@M@nB#83
zMk``;q=HyK!zP@ZVC>MnH%)K@qY1|<xOR*rj^(dB!_rrtVd%&ncE0X)4Bb9WXMPnO
z=w3yQ>ZKU6x(JcpiK(pi#AQS3eCaRF*G*Jz8$wq~NFul-9iU+a*Bu;<C0lz7dGMeh
zP@0<7sI=@yXBIeibk-wUE?s&E<*_k>O6?}91w-w&-6<R8CwC~LXg+t2lfVA|5MN$L
zho&cqgL+mMT&-N<247EugEZSz-8+gYmvB*nSm%MYj--`%UpyO=rP(eM(M#!#1px)D
zd#<g6xEa%m5|jv~=@Ewa-Ewn#L$#(nHPMUNGXrNl*HN7HkoOvI0$KGN#sc6u$Vz!P
zbFNBQuOf-~?#kF<W9w^k;{+SKfoO3XKUeTx!iWhV(1gP!bTz<)X^tMjbu1f=E{Su5
zqeE18?Y*hkDy^yRoJk9y3jsoA-8BX4U5F?t@aI{OQ6z74Kga+QLwTl-DuuY%ViT_p
zu!6)6XN9EYd1kHE_Ss)w`RCm)(Te&VGwgcTyV<yKhSsG^wC69;xwM3}U`4SJS;j_&
zsqNZ-Q^5^NWhU;qkF&q~7h4o1qysXP3=}F!UOv!Q4VO2pq)cw+L8OD?^spfutAp0K
zIPtnx((#E-5C=&&Ca9Ks5!-eKO)D5S2369G+;$7~eYaAXox@=e9pG$CXLXt7XTL@3
zOJ5<Z*QiX+++4L_LTWR63h9I`<-0GpfT(o7Pp{j%kc8-62<1r@N!`ry!4YrB;>4?k
zY%YZ0b#DrCw4M-F=yS#TDMu7lt-VgK28`T(*jLIV2}ta#$OS5sI|;&&jVn!(;V~)`
z)7<P^Wp*#RVtTI3mZJs=lB%+6p?chPS`M2VA(uU$1`?qr9Ic`Qjf?%L0&$Yxed<Yk
zCFgoXSS_RUHnn0J7&X4eHK>&s+II`e*}_;^K^sl7wn*pvS)2$R74na9GeOA6J-7P8
z64eV9`f@XUgpDdtq=m3p73y+yFIp2T1XE>9rQ|z%5{FBJ2eDq)x>z7Ja<-cgw{0Jd
zR-`Ye8-r24{;9He8XW}alt|8wU29F!SS7l!fL4ZXCn1iLn+~oH0_uDB<gEjJR$sCC
zUNm|c&#(o^x?uFe9qBCH*y60kCF1X~AhGqJCJq-{NQ7uD+B!m0Kuvpk-c$mH59|YL
z(*uwmC29=PY|uToOlho&H6aV<&fj!!l?fQR?GR$qWg7eL9+hQcw*xt&1~ZV=0Ki$Z
z$XG~FD<e*@vBjm+N+q#~wO)#22T9N8jaIw9@}>`5r6_4lS$TbHLQQ3QClYtjVc-W>
zhM}LD5r!n|4dN&wsF%T%SX;P662~{!W2n@axcdQANmHI4rMhp5aH5V1(mvd7lGBe@
z1zAz(JW3_oLNHoE0)vf`eCbO;dc~$bZ(=?8iLZ`tEk(Isn;WzSLK(pzgdI!c>8I%~
zT%t5FiG(Fo5JFJGS)qIR5()^1s?>JwqP4id(uH&E+<$X}iOTdYs(W`Zb^m?r`tJ9z
z`s@=lUVM($rAs91O_KE%-G#MYo@+a!S2Su0q@>Y96;Dj1!GffHAmTiz2)^De9jD@A
z-yC!0rFGvcL813|!CKk^6{V<m92<Z0G&&7^jX+Q-qen_eDFox^mus!iVMu4a!Rq|{
zO$S#SLw(;K8ZW)X(Vu#N$-5rtB~~|9x%j2O<oIv>H=_AfRG?FSK{mJW(BmA$IfBV5
z1O|z$2he(dR-^!`O?&UGAd!MD(6KBnt>%N5bDbNex+Vseont-`7A!QJrj4Q9NoZeg
z5}jWqI<ta75!9+wr)R-hTC1xx78h@>$55#=`CYH1dFnjt=TG*%77mTE_wDaz*TZkd
zu1A}V9>r8u!Qg3)s(P-#B`%G^T+g6I4(SN4B}hYXiw;?dkyb({NoYsy%{>uirD-~g
zNxhLkfkUw-j*B+olC`Xeup!VzksuhO3B!O=XlOT9Svr6Art96YyY9m!mif>B>6XF9
z#J#T~oUZrj-@GDGsZAb*t_2VpPlhKpcez~G1M1dNK$jAvne>WSfYo*zgWHN*@EmQ@
zS7joYRH{WOnj%~g$AV2*L(!^MS#NddL@`ObO?!EXB#v$>z}1~|lxHTm{M9eB_VV*I
z&K{?=aE_$4PSR;HdGvl}zWepqW;DP+6+tcp6txi1+Is_C!8IMO;gDsAEXGK~PlV2O
zcos~Eu+eJu2HzJAnnF=h(6p9Ov$^OwZGp~PM57>JrBX+?VoKeFiUJmws2_ikeMgSo
zG;qU8mGOIya_Q55&GR4oB~%a))`uuhO{0vaHoFH?D)nV``*P+&Uj9U&5oM4LNZTP@
zhqP@^>WigG1*S^_D;+;3pcs_}TO}y12-n!q#LwCa11e*aBu3MSBbFDJNuGQH6L+Xh
zOfj-+4?z%oXZ3Em%G7-iGXKfXvGTQJUfo%jyGD`-s$vMntA4`_l@c|ozdlZ4i_-?y
z1&OluT<I?&DOBwAWpkCH(QfALcUyw1fKY2%&N6JaD%tNHkgkN7p<zgT>t-01(DfnK
zuPpG=-&~+NImP5Hw=uGFmeJWcDnrBH8IPe<Vd9=wQ=T0oUTdfQ72a-09|*m!%&e5j
z8!U@-9j=)mV$k&v!a|j#OA&Niq{!2q06I1yNg}e2k8A?;Cb2U3tq(GSZaa8YB_tRg
z^TRFDZ&czal?-LA={8n5_l?I0Yjq~}?PqLmAN7ez#%AZf{nA^iF!}2Hng6pdVCto8
zOP0J%xwlq*si})CuIv1EFzYr=&I&3th2Cb_UQ)BEscCL;t<y%QB?nrm9JejkY^XGC
z=csADeIIb@6K+b)E9Hk}gaJVq;F5@i=Z~>?;y6P)b~3U57KW#HGPZj!LHO;NB3d3E
zXXf>9WB$*-P)MDqTptQ}J|Nv+$2Jq_xJ}$yu1}rx?cviW{lz_nfW!&ixRW<VURCF2
zUlYj|)zt%UQabG{G?6dwGyx_sgvNX4BH|yHL#!1xu3TdM$|b5}6O8VfV{C3OW4rcH
zsSo{w(>|kz?`8P#KANX4`23jyX9XKOT*qSD7HKA^<QiL9xwNj|4eHr}jhe)JS8Gu>
zZIRmC@wTnCF-p;OLPe{sr{OulMO|!j4cBS=P_ffQI&CEEU1?Xi@+OT2J6A5Te&Gy@
z&mUuWW|rZdGmPy$z{u2;Z;P@wGRrKzkTzk*t6xp?r9bqXKr6wv6Ku;OZR-i0O}!7>
zlpAG5*nPWP34>Fc#R~1Do6hDbFlyJ5To10Jn$9p9bj<8V#Ol`{qj};54~Ft5n25s$
zehigMue>V=K+lsAR-AAlu{dC4c8Z~iF)H;6m0H<P)3TCplGJ0kx5}yc*$bU3i^NTb
zthccn7Kv<e^5a#3RYjGM?mbc5POMK&h);*LY>ahDq2^CrTP^eoTNH^1MycK^$y7x<
zX5-lDK9!^p0v%wK#ulo4dwUx7Z>CfXVAh{J<!72HLv^G?c_^S<4=EYt87PsQ5D|J@
ztWR%SY}4YR^c5$4EvQ=pxz*!r%mK1lQVXh~ws$u}d*)bNx{O`D!p50%4DZ{+#@Tay
z7g2AYf%4MZ79rT?AT_4&FTfBG5D*d&5~h!`$3fr!*{ddfrc6kQ5Jb^jOITZpX{^O;
z#E?`=gyVHe<28RDtD$NotZ0%BBu$5H=bN<o>LB{-;<lQ7vSrh?N-HI8Z;pC?Pj?p?
zJ93!2e(B$_^K}pK{a^heBm4I7&X4~NbFY7$uSB|LIaA?c#^Uk=zG`5R)dyr3CtW7_
z$tr)rbUFk`_tn7p=Z*5iRA^aR3vE`;th0P>o#llMy6u>_ozPiq)0uD6Io~3>(nUHx
z)zh1_%T>E0w|fo&k`%}c;7oc8hV9Z{KFY?~vpn@{zX8B4kGzZFy?fGgm+MmtDpd__
z5k^!$Q@5RA$(C#WC26c}3Y#irAFlJwKGG7SZ1v?S7ln(3Xt_(g5_4uELMzSwRfnZ`
z!PT~ssICXpt&Ex!syU>;vLl;$set(}|G$jv+r#nS`*=QpDF3dX9+^u3Q>zDC!WNOx
zb(UeJ(W&lr1MgI+<6OcpV@gb>I=8>z#5YY_lD@f-#WE_Ds+x@aaD~8T-Z)-rG`*x$
z%j^q7Pbv`>KohL8eVn)gLJ1313s=Y0<-FFwh$(u3Ni3Rps7AE5N@Z*`H<<C-8d@oy
zYIOSdiP$<%rJ1|yR&Iaj^%&(tV>e*5oj5vc4KANN#ihqyAht1@O5dUR&8#e1X(nHD
zn303GP??<aW%#LkW?N0x&tKru=bj*HcQItum2fd|EQE@8f8<9&YXYO$T~;(to?!kH
ze}_)xC77ym;CtUnX>=?<zUG-Tocn_>5y;gwpe3O)JI3gJcQJI!0m52sAb##~z9+x%
z*DQYhBw9hd*65LKs$X?p9bB!LIdmHjf8-ah>1|$m@fl8h_ETK=qfe5YYoMgJ5(Gy$
zRAT=RJ;L5c-p}MV9Y4*>7r6Mw&+@`=|KF@1yF{SiV(7RW`XaYSKJp8F?|=C-f6T%s
zznX8I5R6nf_`#o~HoZH4&&98NhBJTgH&-z)ep27q{rkD~gCAn-=mQMT9k}YbE}nmx
z<!_zx(-8}v%b?=9CS{dG-RpAYXAT`@=Fm}&894bHzmIJsd6kR9vG@Dm#?k-z-)}og
z0H8j-o7=wkgVg8t@z}rmFy~g9Tn>G9AV5euZGwuQqMvlTEU&C_&L|Gpl!tbXXyr;D
zxXJq3)dMmT>IbJd_#;2Y?uXxZePK%!<yu~=eyy*!E8G8e+z!0&pEG{{VL#kbDFjD-
z-vqng_Q+L%E#78d{TB57cd%Fs!02>8x6K+ec8-f!=Ig3B=HP~I7Gd($uVD6}M{b~+
zs+4;>MPLVy@P^6OB#!8;EE2a{>GoPRh9;)bX`ys|W)CB`-NM3OKaEMPY;|^$u+~pG
zwihpwblRXaCJ3lZPWNpGQ@Q<4%r~BePQ0y&*GeHum{$%}R@^eM+1r3c-QsB>P==v>
z`_N&p5xjNz0&6cGBVKR#4VhAM-8q3Uq;>I<A5f<Xfyx%WXEzM)`o*(6{%gO&g=dc8
zfStD=;-R1Y4-D_zU7!F<eg38z7*7K5+{gYC%g;ZLLQ|fc;GU2C0wenm^_Z?og<zok
zb2DKNX*V*Lj8HL#R}M72Tzxu|5Y)?r!=ruAt~~n$FZ{}{(tK$l?WzZ@6`hixM$5!2
zEwHi)SaqX1ca!9{TP&YA#l>%(!69fdoAYJ`Ms1*yJ-;=MpJL_l(<q=ivxsds2R_65
zv07~pkIn-Rzq}VkXj{j~jnF>HX6khG_PaRv;~ye!uH}oryS&K4(@$~X)89-TwxADG
zMSorI-w)g*q221>5E2nwC)#vyT*uZ2rW~eHrwJ+{ef93CGp@7I*H_6oWf5PNaZGN2
zQB!E*PM7xOi+#@z?LNTJ?#&*<+=Z8!d)wdg%zyb+y7L>oplO?n9~2XiavcXWx_duw
z{MnDvUAlx5p*Fdb;i+B;X}rEl=gO6yTG-}8lSY$Rfx)r5(k33<_eZ5V^(u=x3$YE}
zRWoUC@QvIAq4B~?v==W@otnMsdxv))VE8=;SbgCbr+@FSu<P+ajMyKc-LT}=#wNJ+
z4d1=(>nq2;&dN8Q^RvXSay$Cbe@}P$il40;RyWOP@XI|N$D+1NlB$C9-W%|KL$wbW
z7Qgxwr+(+xIr4A*!*%`5?f>k@xcJ#G(_UX@)81}_lB=%D8C?JE(lcM@*spzz&gm8O
zHJqaz_r2lT%Ql+~B3lEjluF4V)oUr08$An+TeF<`y+5Tje}SEEd@~~lkD$V`pA%~>
zrHLJcV>|Lp_Q;-F32LR>o)o#1Eh99&1<!iDw~b5Z`P#4lADnpfiws?CF^<Ol122@9
z#KQPX*@jq3O^#&j+kk#vj}k75Wlr~V?p~#sRP!pLr8e__^ko)5|4nqg<U4}|+R|bF
z``^nQKm1_`hWlNWK9WjpuXFQ6-Zen(HX9_}F7=5WJ)d-Roa*ER8>g441tmXR?H{-f
zvgNL?LT4$}^B5!rY4A3F_-^j`i63CRR>h>pq)R257w5V1=vQf<UZJ{wg5f*&r(<K2
z{*95_ZNE+JputsY(?CvO>xPp-$=wc`#goT*{<D9^UGIKBGlzU-O;D}#UH|MyX`FtU
z`9Jw0aP3n5rI(KrHP`)Qys*Uho&)`jf@$N2%2k5eGB{A_W*vF6$iQv-;GK;B=+F2e
z7}>c70gF$4jkPDAW&QLr!*}lIjt~DFVSR)=-I0aIPACnJY-(bZ#P%68#Z`g`UEo{Y
zRUB_+45uIaItwoz=Ldf4<2^$+G0g-2`e%4*@d}MEzktcJlw05a?*IH{=D+bQIt-}K
zPV&}Y{Lkz-cx03FudWhhsRHTlwowaO8_Gi?TNIO&`hFjp-AhovJ`efaqn{*MYoi9h
z)Jn0@a|L^{uGPQ*kZpj`f!{~x#Yex!7ys*j?0aqU);qZU2R}&lmPs5}?~`b+tkS%&
zM)S-H?S*CBKp>LqQ=u=8-%5RC!-N$#V9<&?z=~jRpn&lBfBQ|Mg$;D!sIp7iba|ap
zJ1^VM{KaA>Qz4kJe~AxG?jWd?>2zbB_~TFU;-i1w?`S{#9&Y=WKSVH6#?Mm%j3FHB
z-}^iaOTNZedv2jRKGkmwD%GC!I=}ogMhqY*mnqfjXzBUWT5Bq!<JSdHWpvaJq5xD7
zP#&AQdhoQd#_3Q0K99cdZ8W}l8tt}L2^TwYR{Z=m_0uDBiBih!t_Q>-*pw-9`0XG}
zy+moGT8K&=-PJZpCq`>cI9g$-R$@HxUgmHZP>U_yg*Ms=9bl~zz-TQm)&Pi>TO^&t
z^A3TgyrYgv$#WDW?TEP1=@Ze~%vhhkO1d%8YHyUa3N+>MdO8nsE9bJuuDCd%ez`$y
zt&18e5l&Y7+NKf_(y6Vfj&-<Bj9uz(nKDwTN_e`_!g_H3O%CqfdO(7oBj$jF-cQ-W
zP3rNXzRqe?X(n{Qu+~(R2f72S0+DP!!F-~T>KTq=c2ntMM~=!bZ0;sx?=!l8v({|H
z)YSsD^zV&=u~tH@n{2AHE0zWf&OujO@*MEwMu$d}04xIsa)TD6dpo%FXXZT^)TW%-
zAO~Pk#FD8MpLFRWG!Wt}5a=6&qzZaZ<)LmL#U!d{S<~%nmDZcny2Xn^VSvwed_?g=
zD8*Vm1P!&e9q^RYw(0o6j|-IIrB1|poO3E41sZvT7Ur4Qv_fVeX1hAT&_!q>jQQz{
ztRut-Mim>H2R>I77!AoHF&StE$*gU0K7s0+9=bJYAcI_B|NB)B;6}9s5>x9WeeS5f
zM%Fmn1nhVx;!-=xbnT~s-|2J3j8X*YzGI@idMLUYR|_n%!o7|-96}R_($se`GuxlC
z?C-@@h541eL6*Hn=fN3Zy^k4qZ7WfeEqppDOk+~es0MztRo8Bcx6~G(8U;&<<4mVZ
zBeof^XMmpsntk8~%I`83rfu<(&1!_cO@g+SUZv;=T*3J^s=jILlGh^iFT5h=g<1zy
zDCd;IB+DW}T&zCHd&~w@k8E)<WD~ocj%m?s)Js4_scU=lcMAZ=B6OUeE4&ybG!vT{
zFMz)SegZhz7eqJ_o@sP?$8r^4@oHXV7t4ye`F+4Q6jK360Jr~Nn}fV|eS`GPyIcW&
z4)`CL#1_G|8NmP0o7{*K|BrE#Z`<1<;BnwDfZqZdu$im+{{{fqlW@FIuZija0000<
KMNUMnLSTa8x<0f3

diff --git a/bundles/ruby-on-rails.tmbundle/Support/images/svn.png b/bundles/ruby-on-rails.tmbundle/Support/images/svn.png
deleted file mode 100644
index 47e067692e9e49c9f06d8a0fd4d7604efe8b7c08..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 929
zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc3?z4jzqJQaEa{HEjtmUzPnffIy#(?lOI#yL
zg7ec#$`gxH85~pclTsBta}(23gHjVyDhp4h+AuIMHU#*DxK3Pg{`LEBPhWp|^y1U$
zYcCF-d$Q%|-A#w?uG@Ee*{&O{3r<!}J5n;~P|?JLdA<9a=bf0j{?h8bw+i|X6i+<Z
zIQPWMcVF}S_IEEiliR!R=*6dn6Att(KRbE#`Rty3GuB<KnQ^ps=FybaUGG2rn7;1f
zk{#ENTzGo+#>-#7|IXWdC9iLP)wClIpMQG!_G|H^L%F^C%O)RcUwCTQ$%nuH{=N6~
z!<p+Z`j($7nsD&eqxTnXy}EMub<6ydd42o7e*0B5{m6+c&;S1Wx9`lO2hTrsEIL&;
z>)7Y7KdWXO?OA%JXW5zOZ@w(qcJ0uGClyl<FWh={$B75|eFr{&{Z%{j*qaaEb{v0j
z{?@A>KYzC`IyGhW`L92IKY0GJX6DgH&p%y%@b=1`H|K7=oV)3A|MIi*w_JJm>HE)L
zf6AvG{_y4JM<Dw8WAXND4RelnEk3>Oz@3cFJ=xuRb9(pfKJ_rIV|VrRqo=MuU$_5u
zYWwah_ulM3`}obr@Asa3Y@BnVu>U~cva?gyT*&F!S33F7e=sQK+EN3Iu!fQ#zhH>S
zfRPLqtlsIsbRq5O;uunKtLK7iw3DNR!^3{Dg1q<#al53C@QLi+y_-8aXNKf|tEM$I
z5f#(ke>zY;d4cA!n5k}h1#+QjMeDsq*gW@!eU+Ph@xq&TyUSAKm&iNvxQTskd>2$_
z#(MLOutyTx`P^rd-p;by=OJUUu1hFl?ZJYsOZR5z_p!FHNI&*CFne0it(TvF=ilX<
z`X*w|ovDHuYuWXVNb^pd_ww`F%S=o6|5z^NcKqpE+rJx5*2uhhwAgfy<(eCj`ahEl
z_Epy?a!(OUN!UBnb)oc1rel%e7XGGO$D8K*DoY<r`oCvW(L|#PHHl|ZcETAv6}9dU
zRDw1wzssZK(sXrUirs=}ZOij)8+_N)N3?zAU)rjjzeRNUsa`eP5C2b|-Jo@Vq4<AG
V*Dv`LQDBrYc)I$ztaD0e0sx_`NdEu;

diff --git a/bundles/ruby-on-rails.tmbundle/Support/javascripts/prototype.js b/bundles/ruby-on-rails.tmbundle/Support/javascripts/prototype.js
deleted file mode 100644
index 6385503a1..000000000
--- a/bundles/ruby-on-rails.tmbundle/Support/javascripts/prototype.js
+++ /dev/null
@@ -1,4221 +0,0 @@
-/*  Prototype JavaScript framework, version 1.6.0.2
- *  (c) 2005-2008 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.2',
-
-  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('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;
-    var properties = Object.keys(source);
-
-    if (!Object.keys({ toString: true }).length)
-      properties.push("toString", "valueOf");
-
-    for (var i = 0, length = properties.length; i < length; i++) {
-      var property = properties[i], 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.isUndefined(object)) return 'undefined';
-      if (object === null) return 'null';
-      return object.inspect ? object.inspect() : String(object);
-    } 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 (!Object.isUndefined(value))
-        results.push(property.toJSON() + ': ' + value);
-    }
-
-    return '{' + results.join(', ') + '}';
-  },
-
-  toQueryString: function(object) {
-    return $H(object).toQueryString();
-  },
-
-  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 != null && typeof object == "object" &&
-      'splice' in object && 'join' in object;
-  },
-
-  isHash: function(object) {
-    return object instanceof Hash;
-  },
-
-  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[^(]*\((.*?)\)/)[1].split(",").invoke("strip");
-    return names.length == 1 && !names[0] ? [] : names;
-  },
-
-  bind: function() {
-    if (arguments.length < 2 && Object.isUndefined(arguments[0])) 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 = Object.isUndefined(count) ? 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 = Object.isUndefined(truncation) ? '...' : 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) {
-    return count < 1 ? '' : new Array(count + 1).join(this);
-  },
-
-  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;
-    if (str.blank()) return false;
-    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 before;
-
-      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);
-    });
-  }
-});
-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 = Object.isUndefined(fillWith) ? 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 == null || 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 == null || 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();
-  var length = iterable.length || 0, results = new Array(length);
-  while (length--) results[length] = iterable[length];
-  return results;
-}
-
-if (Prototype.Browser.WebKit) {
-  $A = function(iterable) {
-    if (!iterable) return [];
-    if (!(Object.isFunction(iterable) && iterable == '[object NodeList]') &&
-        iterable.toArray) return iterable.toArray();
-    var length = iterable.length || 0, results = new Array(length);
-    while (length--) results[length] = iterable[length];
-    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 (!Object.isUndefined(value)) 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) {
-  if (!Object.isString(string)) return [];
-  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();
-});
-function $H(object) {
-  return new Hash(object);
-};
-
-var Hash = Class.create(Enumerable, (function() {
-
-  function toQueryPair(key, value) {
-    if (Object.isUndefined(value)) return key;
-    return key + '=' + encodeURIComponent(String.interpret(value));
-  }
-
-  return {
-    initialize: function(object) {
-      this._object = Object.isHash(object) ? object.toObject() : Object.clone(object);
-    },
-
-    _each: function(iterator) {
-      for (var key in this._object) {
-        var value = this._object[key], pair = [key, value];
-        pair.key = key;
-        pair.value = value;
-        iterator(pair);
-      }
-    },
-
-    set: function(key, value) {
-      return this._object[key] = value;
-    },
-
-    get: function(key) {
-      return this._object[key];
-    },
-
-    unset: function(key) {
-      var value = this._object[key];
-      delete this._object[key];
-      return value;
-    },
-
-    toObject: function() {
-      return Object.clone(this._object);
-    },
-
-    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(object) {
-      return this.clone().update(object);
-    },
-
-    update: function(object) {
-      return new Hash(object).inject(this, function(result, pair) {
-        result.set(pair.key, pair.value);
-        return result;
-      });
-    },
-
-    toQueryString: function() {
-      return this.map(function(pair) {
-        var key = encodeURIComponent(pair.key), values = pair.value;
-
-        if (values && typeof values == 'object') {
-          if (Object.isArray(values))
-            return values.map(toQueryPair.curry(key)).join('&');
-        }
-        return toQueryPair(key, values);
-      }).join('&');
-    },
-
-    inspect: function() {
-      return '#<Hash:{' + this.map(function(pair) {
-        return pair.map(Object.inspect).join(': ');
-      }).join(', ') + '}>';
-    },
-
-    toJSON: function() {
-      return Object.toJSON(this.toObject());
-    },
-
-    clone: function() {
-      return new Hash(this);
-    }
-  }
-})());
-
-Hash.prototype.toTemplateReplacements = Hash.prototype.toObject;
-Hash.from = $H;
-var ObjectRange = Class.create(Enumerable, {
-  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();
-    }
-  },
-
-  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();
-    else if (Object.isHash(this.options.parameters))
-      this.options.parameters = this.options.parameters.toObject();
-  }
-});
-
-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 = Object.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 && this.isSameOrigin() && 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;
-    }
-  },
-
-  isSameOrigin: function() {
-    var m = this.url.match(/^\s*https?:\/\/[^\/]*/);
-    return !m || (m[0] == '#{protocol}//#{domain}#{port}'.interpolate({
-      protocol: location.protocol,
-      domain: document.domain,
-      port: location.port ? ':' + location.port : ''
-    }));
-  },
-
-  getHeader: function(name) {
-    try {
-      return this.transport.getResponseHeader(name) || null;
-    } 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  = Object.isUndefined(xml) ? 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');
-    if (!json) return null;
-    json = decodeURIComponent(escape(json));
-    try {
-      return json.evalJSON(this.request.options.sanitizeJSON ||
-        !this.request.isSameOrigin());
-    } catch (e) {
-      this.request.dispatchException(e);
-    }
-  },
-
-  _getResponseJSON: function() {
-    var options = this.request.options;
-    if (!options.evalJSON || (options.evalJSON != 'force' &&
-      !(this.getHeader('Content-type') || '').include('application/json')) ||
-        this.responseText.blank())
-          return null;
-    try {
-      return this.responseText.evalJSON(options.sanitizeJSON ||
-        !this.request.isSameOrigin());
-    } 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 = Object.clone(options);
-    var onComplete = options.onComplete;
-    options.onComplete = (function(response, json) {
-      this.updateContent(response.responseText);
-      if (Object.isFunction(onComplete)) onComplete(response, json);
-    }).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);
-    }
-  }
-});
-
-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, insert, tagName, childNodes;
-
-    for (var position in insertions) {
-      content  = insertions[position];
-      position = position.toLowerCase();
-      insert = Element._insertionTranslations[position];
-
-      if (content && content.toElement) content = content.toElement();
-      if (Object.isElement(content)) {
-        insert(element, content);
-        continue;
-      }
-
-      content = Object.toHTML(content);
-
-      tagName = ((position == 'before' || position == 'after')
-        ? element.parentNode : element).tagName.toUpperCase();
-
-      childNodes = Element._getContentFromAnonymousElement(tagName, content.stripScripts());
-
-      if (position == 'top' || position == 'after') childNodes.reverse();
-      childNodes.each(insert.curry(element));
-
-      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 $(element).select("*");
-  },
-
-  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 Object.isNumber(expression) ? ancestors[expression] :
-      Selector.findElement(ancestors, expression, index);
-  },
-
-  down: function(element, expression, index) {
-    element = $(element);
-    if (arguments.length == 1) return element.firstDescendant();
-    return Object.isNumber(expression) ? element.descendants()[expression] :
-      element.select(expression)[index || 0];
-  },
-
-  previous: function(element, expression, index) {
-    element = $(element);
-    if (arguments.length == 1) return $(Selector.handlers.previousElementSibling(element));
-    var previousSiblings = element.previousSiblings();
-    return Object.isNumber(expression) ? previousSiblings[expression] :
-      Selector.findElement(previousSiblings, expression, index);
-  },
-
-  next: function(element, expression, index) {
-    element = $(element);
-    if (arguments.length == 1) return $(Selector.handlers.nextElementSibling(element));
-    var nextSiblings = element.nextSiblings();
-    return Object.isNumber(expression) ? nextSiblings[expression] :
-      Selector.findElement(nextSiblings, expression, index);
-  },
-
-  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] = Object.isUndefined(value) ? true : value;
-
-    for (var attr in attributes) {
-      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 ||
-      new RegExp("(^|\\s)" + className + "(\\s|$)").test(elementClassName)));
-  },
-
-  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);
-    var originalAncestor = ancestor;
-
-    if (element.compareDocumentPosition)
-      return (element.compareDocumentPosition(ancestor) & 8) === 8;
-
-    if (element.sourceIndex && !Prototype.Browser.Opera) {
-      var e = element.sourceIndex, a = ancestor.sourceIndex,
-       nextAncestor = ancestor.nextSibling;
-      if (!nextAncestor) {
-        do { ancestor = ancestor.parentNode; }
-        while (!(nextAncestor = ancestor.nextSibling) && ancestor.parentNode);
-      }
-      if (nextAncestor && nextAncestor.sourceIndex)
-       return (e > a && e < nextAncestor.sourceIndex);
-    }
-
-    while (element = element.parentNode)
-      if (element == originalAncestor) 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') ?
-          (Object.isUndefined(elementStyle.styleFloat) ? '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.getStyle(element, 'overflow') || 'auto';
-    if (element._overflow !== '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 !== 'static') 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 (Prototype.Browser.Opera) {
-  Element.Methods.getStyle = Element.Methods.getStyle.wrap(
-    function(proceed, element, style) {
-      switch (style) {
-        case 'left': case 'top': case 'right': case 'bottom':
-          if (proceed(element, 'position') === 'static') return null;
-        case 'height': case 'width':
-          // returns '0px' for hidden elements; we want it to return null
-          if (!Element.visible(element)) return null;
-
-          // returns the border-box dimensions rather than the content-box
-          // dimensions, so we subtract padding and borders from the value
-          var dim = parseInt(proceed(element, style), 10);
-
-          if (dim !== element['offset' + style.capitalize()])
-            return dim + 'px';
-
-          var properties;
-          if (style === 'height') {
-            properties = ['border-top-width', 'padding-top',
-             'padding-bottom', 'border-bottom-width'];
-          }
-          else {
-            properties = ['border-left-width', 'padding-left',
-             'padding-right', 'border-right-width'];
-          }
-          return properties.inject(dim, function(memo, property) {
-            var val = proceed(element, property);
-            return val === null ? memo : memo - parseInt(val, 10);
-          }) + 'px';
-        default: return proceed(element, style);
-      }
-    }
-  );
-
-  Element.Methods.readAttribute = Element.Methods.readAttribute.wrap(
-    function(proceed, element, attribute) {
-      if (attribute === 'title') return element.title;
-      return proceed(element, attribute);
-    }
-  );
-}
-
-else if (Prototype.Browser.IE) {
-  // IE doesn't report offsets correctly for static elements, so we change them
-  // to "relative" to get the values, then change them back.
-  Element.Methods.getOffsetParent = Element.Methods.getOffsetParent.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;
-    }
-  );
-
-  $w('positionedOffset 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);
-        // Trigger hasLayout on the offset parent so that IE6 reports
-        // accurate offsetTop and offsetLeft values for position: fixed.
-        var offsetParent = element.getOffsetParent();
-        if (offsetParent && offsetParent.getStyle('position') === 'fixed')
-          offsetParent.setStyle({ zoom: 1 });
-        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);
-    var currentStyle = element.currentStyle;
-    if ((currentStyle && !currentStyle.hasLayout) ||
-      (!currentStyle && element.style.zoom == 'normal'))
-        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) {
-          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.extend({
-      cellpadding: 'cellPadding',
-      cellspacing: 'cellSpacing'
-    }, 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 && /rv:1\.8\.0/.test(navigator.userAgent)) {
-  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 Element#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 ('outerHTML' in document.createElement('div')) {
-  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];
-  if (t) {
-    div.innerHTML = t[0] + html + t[1];
-    t[2].times(function() { div = div.firstChild });
-  } else div.innerHTML = html;
-  return $A(div.childNodes);
-};
-
-Element._insertionTranslations = {
-  before: function(element, node) {
-    element.parentNode.insertBefore(node, element);
-  },
-  top: function(element, node) {
-    element.insertBefore(node, element.firstChild);
-  },
-  bottom: function(element, node) {
-    element.appendChild(node);
-  },
-  after: function(element, node) {
-    element.parentNode.insertBefore(node, element.nextSibling);
-  },
-  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() {
-  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 = { };
-    var B = Prototype.Browser;
-    $w('width height').each(function(d) {
-      var D = d.capitalize();
-      dimensions[d] = (B.WebKit && !document.evaluate) ? self['inner' + D] :
-        (B.Opera) ? document.body['client' + D] : document.documentElement['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();
-  },
-
-  shouldUseXPath: function() {
-    if (!Prototype.BrowserFeatures.XPath) return false;
-
-    var e = this.expression;
-
-    // Safari 3 chokes on :*-of-type and :empty
-    if (Prototype.Browser.WebKit &&
-     (e.include("-of-type") || e.include(":empty")))
-      return false;
-
-    // XPath can't do namespaced attributes, nor can it read
-    // the "checked" property from DOM nodes
-    if ((/(\[[\w-]*?:|:checked)/).test(this.expression))
-      return false;
-
-    return true;
-  },
-
-  compileMatcher: function() {
-    if (this.shouldUseXPath())
-      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: function(m) {
-      m[1] = m[1].toLowerCase();
-      return new Template("[@#{1}]").evaluate(m);
-    },
-    attr: function(m) {
-      m[1] = m[1].toLowerCase();
-      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, 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); c = false;',
-    attr: function(m) {
-      m[3] = (m[5] || m[6]);
-      return new Template('n = h.attr(n, r, "#{1}", "#{3}", "#{2}", c); 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 nodeValue && Selector.operators[matches[2]](nodeValue, matches[5] || matches[6]);
-    }
-  },
-
-  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) {
-      var _true = Prototype.emptyFunction;
-      for (var i = 0, node; node = nodes[i]; i++)
-        node._countedByPrototype = _true;
-      return nodes;
-    },
-
-    unmark: function(nodes) {
-      for (var i = 0, node; node = nodes[i]; i++)
-        node._countedByPrototype = 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._countedByPrototype = Prototype.emptyFunction;
-      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._countedByPrototype)) node.nodeIndex = j++;
-        }
-      } else {
-        for (var i = 0, j = 1, nodes = parentNode.childNodes; node = nodes[i]; i++)
-          if (node.nodeType == 1 && (!ofType || node._countedByPrototype)) 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])._countedByPrototype) {
-          n._countedByPrototype = Prototype.emptyFunction;
-          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, 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) {
-      var uTagName = 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() === uTagName) 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, combinator) {
-      if (!nodes) nodes = root.getElementsByTagName("*");
-      if (nodes && combinator) nodes = this[combinator](nodes);
-      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, combinator) {
-      if (!nodes) nodes = root.getElementsByTagName("*");
-      if (nodes && combinator) nodes = this[combinator](nodes);
-      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._countedByPrototype) {
-          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._countedByPrototype) 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() + '-'); }
-  },
-
-  split: function(expression) {
-    var expressions = [];
-    expression.scan(/(([\w#:.~>+()\s-]+|\*|\[.*?\])+)\s*(,|$)/, function(m) {
-      expressions.push(m[1].strip());
-    });
-    return expressions;
-  },
-
-  matchElements: function(elements, expression) {
-    var matches = $$(expression), h = Selector.handlers;
-    h.mark(matches);
-    for (var i = 0, results = [], element; element = elements[i]; i++)
-      if (element._countedByPrototype) 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) {
-    expressions = Selector.split(expressions.join(','));
-    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;
-  }
-});
-
-if (Prototype.Browser.IE) {
-  Object.extend(Selector.handlers, {
-    // IE returns comment nodes on getElementsByTagName("*").
-    // Filter them out.
-    concat: function(a, b) {
-      for (var i = 0, node; node = b[i]; i++)
-        if (node.tagName !== "!") a.push(node);
-      return a;
-    },
-
-    // IE improperly serializes _countedByPrototype in (inner|outer)HTML.
-    unmark: function(nodes) {
-      for (var i = 0, node; node = nodes[i]; i++)
-        node.removeAttribute('_countedByPrototype');
-      return nodes;
-    }
-  });
-}
-
-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 (Object.isUndefined(options.hash)) 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 : Object.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 Object.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 (Object.isUndefined(value)) return element.checked ? element.value : null;
-    else element.checked = !!value;
-  },
-
-  textarea: function(element, value) {
-    if (Object.isUndefined(value)) return element.value;
-    else element.value = value;
-  },
-
-  select: function(element, index) {
-    if (Object.isUndefined(index))
-      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 = (function() {
-  var isButton;
-
-  if (Prototype.Browser.IE) {
-    var buttonMap = { 0: 1, 1: 4, 2: 2 };
-    isButton = function(event, code) {
-      return event.button == buttonMap[code];
-    };
-
-  } else if (Prototype.Browser.WebKit) {
-    isButton = function(event, code) {
-      switch (code) {
-        case 0: return event.which == 1 && !event.metaKey;
-        case 1: return event.which == 1 && event.metaKey;
-        default: return false;
-      }
-    };
-
-  } else {
-    isButton = function(event, code) {
-      return event.which ? (event.which === code + 1) : (event.button === code);
-    };
-  }
-
-  return {
-    isLeftClick:   function(event) { return isButton(event, 0) },
-    isMiddleClick: function(event) { return isButton(event, 1) },
-    isRightClick:  function(event) { return isButton(event, 2) },
-
-    element: function(event) {
-      var node = Event.extend(event).target;
-      return Element.extend(node.nodeType == Node.TEXT_NODE ? node.parentNode : node);
-    },
-
-    findElement: function(event, expression) {
-      var element = Event.element(event);
-      if (!expression) return element;
-      var elements = [element].concat(element.ancestors());
-      return Selector.findElement(elements, expression, 0);
-    },
-
-    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.extend(event);
-      event.preventDefault();
-      event.stopPropagation();
-      event.stopped = true;
-    }
-  };
-})();
-
-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._prototypeEventID) return element._prototypeEventID[0];
-    arguments.callee.id = arguments.callee.id || 1;
-    return element._prototypeEventID = [++arguments.callee.id];
-  }
-
-  function getDOMEventName(eventName) {
-    if (eventName && eventName.include(':')) return "dataavailable";
-    return 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 || !Event.extend ||
-        (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;
-
-      var event;
-      if (document.createEvent) {
-        event = document.createEvent("HTMLEvents");
-        event.initEvent("dataavailable", true, true);
-      } else {
-        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.extend(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(),
-  loaded:        false
-});
-
-(function() {
-  /* Support for the DOMContentLoaded event is based on work by Dan Webb,
-     Matthias Miller, Dean Edwards and John Resig. */
-
-  var timer;
-
-  function fireContentLoadedEvent() {
-    if (document.loaded) return;
-    if (timer) window.clearInterval(timer);
-    document.fire("dom:loaded");
-    document.loaded = 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 -------------------------------*/
-
-Hash.toQueryString = Object.toQueryString;
-
-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 --git a/bundles/ruby-on-rails.tmbundle/Support/lib/rails/buffer.rb b/bundles/ruby-on-rails.tmbundle/Support/lib/rails/buffer.rb
deleted file mode 100755
index 7574181ce..000000000
--- a/bundles/ruby-on-rails.tmbundle/Support/lib/rails/buffer.rb
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright:
-#   (c) 2006 syncPEOPLE, LLC.
-#   Visit us at http://syncpeople.com/
-# Author: Duane Johnson (duane.johnson@gmail.com)
-# Description:
-#   Makes analyzing of a Rails path + filename easier.
-
-require 'rails/text_mate'
-require 'rails/misc'
-
-# Stores lines of text
-class Buffer
-  # The actual lines of the text file
-  attr_reader :lines
-  # State of caret positions (both 0-based indexes)
-  attr_accessor :line_number, :column_number
-  # Stack for remembering caret positions
-  attr_reader :stack
-
-  # Init from a String or Buffer object
-  def initialize(buffer, line_number = nil, column_number = nil)
-    self.text = buffer
-    @line_number   = line_number   || TextMate.line_number
-    @column_number = column_number || TextMate.column_number
-    @stack = []
-  end
-
-  # Init from a String (filename) or FilePath
-  def self.new_from_file(filepath, line_number = nil, column_number = nil)
-    # In case it's a RailsPath, get the string representing the filepath
-    filepath = filepath.filepath if filepath.respond_to?(:filepath)
-    new(IO.read(filepath, line_number, column_number))
-  end
-
-  def index
-    @lines.slice(0...line_number).join.length
-  end
-
-  def current_line
-    lines[line_number]
-  end
-
-  def push_position
-    @stack.push [@line_number, @column_number]
-  end
-
-  def pop_position
-    @line_number, @column_number = @stack.pop
-  end
-
-  def to_a
-    @lines
-  end
-
-  def text
-    @text ||= lines.join
-  end
-
-  def text=(buffer)
-    @text = buffer.gsub("\r\n", "\n")
-    @lines = @text.to_a
-  end
-
-  def =~(other)
-    text =~ other
-  end
-
-  # Searches a region of the buffer, lines :from to :to
-  # Accepts a block which can evaluate to either true/false indication of a line match,
-  # or a Regexp indicating that the line must match the regexp for the line to match.
-  # An optional :direction of :backward is also accepted if the search is to be reversed.
-  def find(options = {}, &block)
-    options = {:direction => :forward}.update(options)
-
-    # Use some sensible defaults if just a direction is given
-    if direction = options[:direction] == :forward
-      from = options[:from] || line_number
-      to   = options[:to]   || lines.size - 1
-      from, to = to, from if from > to
-      direction = 1
-    else
-      from = options[:from] || 0
-      to   = options[:to]   || line_number
-      from, to = to, from if from < to
-      direction = -1
-    end
-
-    from.step(to, direction) do |i|
-      value = yield(lines[i])
-      value = lines[i].scan(value) if value.is_a? Regexp
-      return [i, value].flatten.compact if value.first
-    end
-    return nil
-  end
-
-  # Search for the nearest "def [method]" declaration
-  def find_method(options = {})
-    options = {:direction => :backward}.update(options)
-    find(options) { %r{def\s+(\w+)} }
-  end
-
-  # Search for the nearest "wants." declaration within a "respond_to" section.
-  def find_respond_to_format
-    m = find_method
-    return nil if m.nil?
-    from, wants = find(:direction => :backward, :from => m.first) { %r{\brespond_to\s.+\|\s*(\w+)\s*\|} }
-    return nil if wants.nil?
-    options = {:direction => lines[from] == current_line ? :forward : :backward, :from => from}
-    find(options) { Regexp.new(wants + '\.(\w+)') }
-  end
-
-  def find_nearest_string_or_symbol(current_line = current_line)
-    current_line.find_nearest_string_or_symbol(column_number)
-  end
-
-end
diff --git a/bundles/ruby-on-rails.tmbundle/Support/lib/rails/command_go_to_file.rb b/bundles/ruby-on-rails.tmbundle/Support/lib/rails/command_go_to_file.rb
deleted file mode 100644
index 751116912..000000000
--- a/bundles/ruby-on-rails.tmbundle/Support/lib/rails/command_go_to_file.rb
+++ /dev/null
@@ -1,199 +0,0 @@
-class CommandGoToFile
-  def self.alternate(args)
-    current_file = RailsPath.new
-
-    choice = args.empty? ? current_file.best_match : args.shift
-
-    if choice.nil?
-      puts "This file is not associated with any other files"
-    elsif rails_path = current_file.rails_path_for(choice.to_sym)    
-      if !rails_path.exists?
-        rails_path, openatline, openatcol = create_file(rails_path, choice.to_sym)
-        if rails_path.nil?
-          TextMate.exit_discard
-        end
-        TextMate.rescan_project
-      end
-
-      TextMate.open rails_path, openatline, openatcol
-    else
-      puts "#{current_file.basename} does not have a #{choice}"
-    end
-  end  
-  
-  def self.on_current_line
-    current_file = RailsPath.new
-
-    # If the current line contains "render :partial", then open the partial.
-    case TextMate.current_line
-
-      # Example: render :partial => 'account/login'
-      when /render[\s\(].*:partial\s*=>\s*['"](.+?)['"]/
-        partial_name = $1
-        modules = current_file.modules + [current_file.controller_name]
-
-        # Check for absolute path to partial
-        if partial_name.include?('/')
-          pieces = partial_name.split('/')
-          partial_name = pieces.pop
-          modules = pieces
-        end
-
-        partial = File.join(current_file.rails_root, 'app', 'views', modules, "_#{partial_name}.html.erb")
-        TextMate.open(partial)
-
-      # Example: render :action => 'login'
-      when /render[\s\(].*:action\s*=>\s*['"](.+?)['"]/
-        action = $1
-        if current_file.file_type == :controller
-          current_file.buffer.line_number = 0
-          if search = current_file.buffer.find { /def\s+#{action}\b/ }
-            TextMate.open(current_file, search[0])
-          end
-        else
-          puts "Don't know where to go when rendering an action from outside a controller"
-          exit
-        end
-
-      # Example: redirect_to :action => 'login'
-      when /(redirect_to|redirect_back_or_default)[\s\(]/
-        controller = action = nil
-        controller = $1 if TextMate.current_line =~ /.*:controller\s*=>\s*['"](.+?)['"]/
-        action = $1 if TextMate.current_line =~ /.*:action\s*=>\s*['"](.+?)['"]/
-
-        unless current_file.file_type == :controller
-          puts "Don't know where to go when redirecting from outside a controller"
-          exit
-        end
-
-        if controller.nil?
-          controller_file = current_file
-        else
-          # Check for modules
-          if controller.include?('/')
-            pieces = controller.split('/')
-            controller = pieces.pop
-            modules = pieces
-          end
-          other_path = File.join(current_file.rails_root, 'app', 'controllers', modules, "#{controller}_controller.rb")
-          controller_file = RailsPath.new(other_path)
-        end
-
-        if search = controller_file.buffer.find(:direction => :backward) { /def\s+#{action}\b/ }
-          TextMate.open(controller_file, search[0])
-        else
-          puts "Couldn't find the #{action} action inside '#{controller_file.basename}'"
-          exit
-        end
-
-      # Example: <script src="/javascripts/controls.js">
-      when /\<script.+src=['"](.+\.js)['"]/
-        javascript = $1
-        if javascript =~ %r{^https?://}
-          TextMate.open_url javascript
-        else
-          full_path = File.join(current_file.rails_root, 'public', javascript)
-          TextMate.open full_path
-        end
-
-      # Example: <%= javascript_include_tag 'general' %>
-      # require_javascript is used by bundled_resource plugin
-      when /(require_javascript|javascript_include_tag)\b/
-        if match = TextMate.current_line.unstringify_hash_arguments.find_nearest_string_or_symbol(TextMate.column_number)
-          javascript = match[0]
-          javascript += '.js' if not javascript =~ /\.js$/
-          # If there is no leading slash, assume it's a js from the public/javascripts dir
-          public_file = javascript[0..0] == "/" ? javascript[1..-1] : "javascripts/#{javascript}"
-          TextMate.open File.join(current_file.rails_root, 'public', public_file)
-        else
-          puts "No javascript identified"
-        end
-
-      # Example: <link href="/stylesheets/application.css">
-      # Example: @import url(/stylesheets/conferences.css);
-      when /\<link.+href=['"](.+\.css)['"]/, /\@import.+url\((.+\.css)\)/
-        stylesheet = $1
-        if stylesheet =~ %r{^https?://}
-          TextMate.open_url stylesheet
-        else
-          full_path = File.join(current_file.rails_root, 'public', stylesheet[1..-1])
-          TextMate.open full_path
-        end
-
-      # Example: <%= stylesheet_link_tag 'application' %>
-      when /(require_stylesheet|stylesheet_link_tag)\b/
-        if match = TextMate.current_line.unstringify_hash_arguments.find_nearest_string_or_symbol(TextMate.column_number)
-          stylesheet = match[0]
-          stylesheet += '.css' if not stylesheet =~ /\.css$/
-          # If there is no leading slash, assume it's a js from the public/javascripts dir
-          public_file = stylesheet[0..0] == "/" ? stylesheet[1..-1] : "stylesheets/#{stylesheet}"
-          TextMate.open File.join(current_file.rails_root, 'public', public_file)
-        else
-          puts "No stylesheet identified"
-        end
-
-      else
-        puts "No 'go to file' directives found on this line."
-        # Do nothing -- beep?
-    end    
-  end
-  
-  protected
-  
-  # Returns the rails_path of the newly created file plus the position 
-  # (zero based) in the file where to place the caret after opening the 
-  # new file. Returns nil when no new file is created.
-  def self.create_file(rails_path, choice)       
-    return nil if rails_path.exists?
-    if choice == :view
-      filename = TextMate::UI.request_string(
-        :title => "View File Not Found", 
-        :default => rails_path.basename,
-        :prompt => "Enter the name of the new view file:",
-        :button1 => 'Create'
-      )
-      return nil if !filename
-      rails_path = RailsPath.new(File.join(rails_path.dirname, filename))
-      rails_path.touch
-      return [rails_path, 0, 0]
-    end
-    
-    unless TextMate::UI.request_confirmation(
-      :button1 => "Create",
-      :button2 => "Cancel",
-      :title => "Missing #{rails_path.basename}",
-      :prompt => "Create missing #{rails_path.basename}?"
-    )
-      return nil
-    end
-
-    generated_code, openatline, openatcol = case choice
-    when :model
-      ["class #{Inflector.singularize rails_path.controller_name.camelize} < ActiveRecord::Base\n\nend", 1, 0]
-    when :controller 
-      ["class #{rails_path.controller_name.camelize}Controller < ApplicationController\n\nend", 1, 0]
-    when :helper
-      ["module #{rails_path.controller_name.camelize}Helper\n\nend", 1, 0]
-    when :unit_test
-      ["require File.dirname(__FILE__) + '/../test_helper'
-
-class #{Inflector.singularize(rails_path.controller_name).camelize}Test < ActiveSupport::TestCase
- # Replace this with your real tests.
- def test_truth
-   assert true
- end
-end", 3, 0]   
-    when :functional_test
-      ["require File.dirname(__FILE__) + '/../test_helper'
-
-class #{rails_path.controller_name.camelize}ControllerTest < ActionController::TestCase     
-
-end", 3, 0]
-    end
-
-    rails_path.touch
-    rails_path.append generated_code if generated_code
-    return [rails_path, openatline, openatcol]
-  end
-    
-end
\ No newline at end of file
diff --git a/bundles/ruby-on-rails.tmbundle/Support/lib/rails/generate.rb b/bundles/ruby-on-rails.tmbundle/Support/lib/rails/generate.rb
deleted file mode 100644
index f08a185f1..000000000
--- a/bundles/ruby-on-rails.tmbundle/Support/lib/rails/generate.rb
+++ /dev/null
@@ -1,56 +0,0 @@
-
-class Generator
-  @@list = []
-  attr_accessor :name, :question, :default_answer
-
-  def initialize(name, question, default_answer = "")
-    @@list << self
-    @name, @question, @default_answer = name, question, default_answer
-  end
-
-  def self.[](name, question, default_answer = "")
-    g = new(name, question, default_answer)
-  end
-
-  def self.setup
-    @@list = setup_generators
-  end
-
-  # Collect the names from each generator
-  def self.names
-    @@list.map { |g| g.name.capitalize }
-  end
-
-  def self.generators
-    @@list
-  end
-
-  def self.setup_generators
-    known_generator_names = known_generators.map { |gen| gen.name }
-    new_generator_names = find_generator_names - known_generator_names
-    known_generators + new_generator_names.map do |name|
-      Generator[name, "Arguments for #{name} generator:", ""]
-    end
-  end
-
-  # Runs the script/generate command and extracts generator names from output
-  def self.find_generator_names
-    list = nil
-    FileUtils.chdir(RailsPath.new.rails_root) do
-      output = ruby 'script/generate | grep "^  [A-Z]" | sed -e "s/  //"'
-      list = output.split(/[,\s]+/).reject {|f| f =~ /:/}
-    end
-    list
-  end
-
-  def self.known_generators
-    [
-      Generator["scaffold",   "Name of the model to scaffold:", "User"],
-      Generator["controller", "Name the new controller:",       "admin/user_accounts"],
-      Generator["model",      "Name the new model:",            "User"],
-      Generator["mailer",     "Name the new mailer:",           "Notify"],
-      Generator["migration",  "Name the new migration:",        "CreateUserTable"],
-      Generator["plugin",     "Name the new plugin:",           "ActsAsPlugin"]
-    ]
-  end
-end
diff --git a/bundles/ruby-on-rails.tmbundle/Support/lib/rails/inflections.rb b/bundles/ruby-on-rails.tmbundle/Support/lib/rails/inflections.rb
deleted file mode 100644
index 967722c2b..000000000
--- a/bundles/ruby-on-rails.tmbundle/Support/lib/rails/inflections.rb
+++ /dev/null
@@ -1,53 +0,0 @@
-Inflector.inflections do |inflect|
-  inflect.plural(/$/, 's')
-  inflect.plural(/s$/i, 's')
-  inflect.plural(/(ax|test)is$/i, '\1es')
-  inflect.plural(/(octop|vir)us$/i, '\1i')
-  inflect.plural(/(alias|status)$/i, '\1es')
-  inflect.plural(/(bu)s$/i, '\1ses')
-  inflect.plural(/(buffal|tomat)o$/i, '\1oes')
-  inflect.plural(/([ti])um$/i, '\1a')
-  inflect.plural(/sis$/i, 'ses')
-  inflect.plural(/(?:([^f])fe|([lr])f)$/i, '\1\2ves')
-  inflect.plural(/(hive)$/i, '\1s')
-  inflect.plural(/([^aeiouy]|qu)y$/i, '\1ies')
-  inflect.plural(/(x|ch|ss|sh)$/i, '\1es')
-  inflect.plural(/(matr|vert|ind)(?:ix|ex)$/i, '\1ices')
-  inflect.plural(/([m|l])ouse$/i, '\1ice')
-  inflect.plural(/^(ox)$/i, '\1en')
-  inflect.plural(/(quiz)$/i, '\1zes')
-
-  inflect.singular(/s$/i, '')
-  inflect.singular(/(n)ews$/i, '\1ews')
-  inflect.singular(/([ti])a$/i, '\1um')
-  inflect.singular(/((a)naly|(b)a|(d)iagno|(p)arenthe|(p)rogno|(s)ynop|(t)he)ses$/i, '\1\2sis')
-  inflect.singular(/(^analy)ses$/i, '\1sis')
-  inflect.singular(/([^f])ves$/i, '\1fe')
-  inflect.singular(/(hive)s$/i, '\1')
-  inflect.singular(/(tive)s$/i, '\1')
-  inflect.singular(/([lr])ves$/i, '\1f')
-  inflect.singular(/([^aeiouy]|qu)ies$/i, '\1y')
-  inflect.singular(/(s)eries$/i, '\1eries')
-  inflect.singular(/(m)ovies$/i, '\1ovie')
-  inflect.singular(/(x|ch|ss|sh)es$/i, '\1')
-  inflect.singular(/([m|l])ice$/i, '\1ouse')
-  inflect.singular(/(bus)es$/i, '\1')
-  inflect.singular(/(o)es$/i, '\1')
-  inflect.singular(/(shoe)s$/i, '\1')
-  inflect.singular(/(cris|ax|test)es$/i, '\1is')
-  inflect.singular(/(octop|vir)i$/i, '\1us')
-  inflect.singular(/(alias|status)es$/i, '\1')
-  inflect.singular(/^(ox)en/i, '\1')
-  inflect.singular(/(vert|ind)ices$/i, '\1ex')
-  inflect.singular(/(matr)ices$/i, '\1ix')
-  inflect.singular(/(quiz)zes$/i, '\1')
-
-  inflect.irregular('person', 'people')
-  inflect.irregular('man', 'men')
-  inflect.irregular('child', 'children')
-  inflect.irregular('sex', 'sexes')
-  inflect.irregular('move', 'moves')
-  inflect.irregular('cow', 'kine')
-
-  inflect.uncountable(%w(equipment information rice money species series fish sheep))
-end
diff --git a/bundles/ruby-on-rails.tmbundle/Support/lib/rails/inflector.rb b/bundles/ruby-on-rails.tmbundle/Support/lib/rails/inflector.rb
deleted file mode 100644
index 789191b5e..000000000
--- a/bundles/ruby-on-rails.tmbundle/Support/lib/rails/inflector.rb
+++ /dev/null
@@ -1,282 +0,0 @@
-require 'singleton'
-
-# The Inflector transforms words from singular to plural, class names to table names, modularized class names to ones without,
-# and class names to foreign keys. The default inflections for pluralization, singularization, and uncountable words are kept
-# in inflections.rb.
-module Inflector
-  # A singleton instance of this class is yielded by Inflector.inflections, which can then be used to specify additional
-  # inflection rules. Examples:
-  #
-  #   Inflector.inflections do |inflect|
-  #     inflect.plural /^(ox)$/i, '\1\2en'
-  #     inflect.singular /^(ox)en/i, '\1'
-  #
-  #     inflect.irregular 'octopus', 'octopi'
-  #
-  #     inflect.uncountable "equipment"
-  #   end
-  #
-  # New rules are added at the top. So in the example above, the irregular rule for octopus will now be the first of the
-  # pluralization and singularization rules that is runs. This guarantees that your rules run before any of the rules that may
-  # already have been loaded.
-  class Inflections
-    include Singleton
-
-    attr_reader :plurals, :singulars, :uncountables
-
-    def initialize
-      @plurals, @singulars, @uncountables = [], [], []
-    end
-
-    # Specifies a new pluralization rule and its replacement. The rule can either be a string or a regular expression.
-    # The replacement should always be a string that may include references to the matched data from the rule.
-    def plural(rule, replacement)
-      @plurals.insert(0, [rule, replacement])
-    end
-
-    # Specifies a new singularization rule and its replacement. The rule can either be a string or a regular expression.
-    # The replacement should always be a string that may include references to the matched data from the rule.
-    def singular(rule, replacement)
-      @singulars.insert(0, [rule, replacement])
-    end
-
-    # Specifies a new irregular that applies to both pluralization and singularization at the same time. This can only be used
-    # for strings, not regular expressions. You simply pass the irregular in singular and plural form.
-    #
-    # Examples:
-    #   irregular 'octopus', 'octopi'
-    #   irregular 'person', 'people'
-    def irregular(singular, plural)
-      if singular[0,1].upcase == plural[0,1].upcase
-        plural(Regexp.new("(#{singular[0,1]})#{singular[1..-1]}$", "i"), '\1' + plural[1..-1])
-        singular(Regexp.new("(#{plural[0,1]})#{plural[1..-1]}$", "i"), '\1' + singular[1..-1])
-      else
-        plural(Regexp.new("#{singular[0,1].upcase}(?i)#{singular[1..-1]}$"), plural[0,1].upcase + plural[1..-1])
-        plural(Regexp.new("#{singular[0,1].downcase}(?i)#{singular[1..-1]}$"), plural[0,1].downcase + plural[1..-1])
-        singular(Regexp.new("#{plural[0,1].upcase}(?i)#{plural[1..-1]}$"), singular[0,1].upcase + singular[1..-1])
-        singular(Regexp.new("#{plural[0,1].downcase}(?i)#{plural[1..-1]}$"), singular[0,1].downcase + singular[1..-1])
-      end
-    end
-
-    # Add uncountable words that shouldn't be attempted inflected.
-    #
-    # Examples:
-    #   uncountable "money"
-    #   uncountable "money", "information"
-    #   uncountable %w( money information rice )
-    def uncountable(*words)
-      (@uncountables << words).flatten!
-    end
-
-    # Clears the loaded inflections within a given scope (default is :all). Give the scope as a symbol of the inflection type,
-    # the options are: :plurals, :singulars, :uncountables
-    #
-    # Examples:
-    #   clear :all
-    #   clear :plurals
-    def clear(scope = :all)
-      case scope
-        when :all
-          @plurals, @singulars, @uncountables = [], [], []
-        else
-          instance_variable_set "@#{scope}", []
-      end
-    end
-  end
-
-  extend self
-
-  def inflections
-    if block_given?
-      yield Inflections.instance
-    else
-      Inflections.instance
-    end
-  end
-
-  # Returns the plural form of the word in the string.
-  #
-  # Examples
-  #   "post".pluralize #=> "posts"
-  #   "octopus".pluralize #=> "octopi"
-  #   "sheep".pluralize #=> "sheep"
-  #   "words".pluralize #=> "words"
-  #   "the blue mailman".pluralize #=> "the blue mailmen"
-  #   "CamelOctopus".pluralize #=> "CamelOctopi"
-  def pluralize(word)
-    result = word.to_s.dup
-
-    if word.empty? || inflections.uncountables.include?(result.downcase)
-      result
-    else
-      inflections.plurals.each { |(rule, replacement)| break if result.gsub!(rule, replacement) }
-      result
-    end
-  end
-
-  # The reverse of pluralize, returns the singular form of a word in a string.
-  #
-  # Examples
-  #   "posts".singularize #=> "post"
-  #   "octopi".singularize #=> "octopus"
-  #   "sheep".singluarize #=> "sheep"
-  #   "word".singluarize #=> "word"
-  #   "the blue mailmen".singularize #=> "the blue mailman"
-  #   "CamelOctopi".singularize #=> "CamelOctopus"
-  def singularize(word)
-    result = word.to_s.dup
-
-    if inflections.uncountables.include?(result.downcase)
-      result
-    else
-      inflections.singulars.each { |(rule, replacement)| break if result.gsub!(rule, replacement) }
-      result
-    end
-  end
-
-  # By default, camelize converts strings to UpperCamelCase. If the argument to camelize
-  # is set to ":lower" then camelize produces lowerCamelCase.
-  #
-  # camelize will also convert '/' to '::' which is useful for converting paths to namespaces
-  #
-  # Examples
-  #   "active_record".camelize #=> "ActiveRecord"
-  #   "active_record".camelize(:lower) #=> "activeRecord"
-  #   "active_record/errors".camelize #=> "ActiveRecord::Errors"
-  #   "active_record/errors".camelize(:lower) #=> "activeRecord::Errors"
-  def camelize(lower_case_and_underscored_word, first_letter_in_uppercase = true)
-    if first_letter_in_uppercase
-      lower_case_and_underscored_word.to_s.gsub(/\/(.?)/) { "::" + $1.upcase }.gsub(/(^|_)(.)/) { $2.upcase }
-    else
-      lower_case_and_underscored_word.first + camelize(lower_case_and_underscored_word)[1..-1]
-    end
-  end
-
-  # Capitalizes all the words and replaces some characters in the string to create
-  # a nicer looking title. Titleize is meant for creating pretty output. It is not
-  # used in the Rails internals.
-  #
-  # titleize is also aliased as as titlecase
-  #
-  # Examples
-  #   "man from the boondocks".titleize #=> "Man From The Boondocks"
-  #   "x-men: the last stand".titleize #=> "X Men: The Last Stand"
-  def titleize(word)
-    humanize(underscore(word)).gsub(/\b([a-z])/) { $1.capitalize }
-  end
-
-  # The reverse of +camelize+. Makes an underscored form from the expression in the string.
-  #
-  # Changes '::' to '/' to convert namespaces to paths.
-  #
-  # Examples
-  #   "ActiveRecord".underscore #=> "active_record"
-  #   "ActiveRecord::Errors".underscore #=> active_record/errors
-  def underscore(camel_cased_word)
-    camel_cased_word.to_s.gsub(/::/, '/').
-      gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
-      gsub(/([a-z\d])([A-Z])/,'\1_\2').
-      tr("-", "_").
-      downcase
-  end
-
-  # Replaces underscores with dashes in the string.
-  #
-  # Example
-  #   "puni_puni" #=> "puni-puni"
-  def dasherize(underscored_word)
-    underscored_word.gsub(/_/, '-')
-  end
-
-  # Capitalizes the first word and turns underscores into spaces and strips _id.
-  # Like titleize, this is meant for creating pretty output.
-  #
-  # Examples
-  #   "employee_salary" #=> "Employee salary"
-  #   "author_id" #=> "Author"
-  def humanize(lower_case_and_underscored_word)
-    lower_case_and_underscored_word.to_s.gsub(/_id$/, "").gsub(/_/, " ").capitalize
-  end
-
-  # Removes the module part from the expression in the string
-  #
-  # Examples
-  #   "ActiveRecord::CoreExtensions::String::Inflections".demodulize #=> "Inflections"
-  #   "Inflections".demodulize #=> "Inflections"
-  def demodulize(class_name_in_module)
-    class_name_in_module.to_s.gsub(/^.*::/, '')
-  end
-
-  # Create the name of a table like Rails does for models to table names. This method
-  # uses the pluralize method on the last word in the string.
-  #
-  # Examples
-  #   "RawScaledScorer".tableize #=> "raw_scaled_scorers"
-  #   "egg_and_ham".tableize #=> "egg_and_hams"
-  #   "fancyCategory".tableize #=> "fancy_categories"
-  def tableize(class_name)
-    pluralize(underscore(class_name))
-  end
-
-  # Create a class name from a table name like Rails does for table names to models.
-  # Note that this returns a string and not a Class. (To convert to an actual class
-  # follow classify with constantize.)
-  #
-  # Examples
-  #   "egg_and_hams".classify #=> "EggAndHam"
-  #   "post".classify #=> "Post"
-  def classify(table_name)
-    # strip out any leading schema name
-    camelize(singularize(table_name.to_s.sub(/.*\./, '')))
-  end
-
-  # Creates a foreign key name from a class name.
-  # +separate_class_name_and_id_with_underscore+ sets whether
-  # the method should put '_' between the name and 'id'.
-  #
-  # Examples
-  #   "Message".foreign_key #=> "message_id"
-  #   "Message".foreign_key(false) #=> "messageid"
-  #   "Admin::Post".foreign_key #=> "post_id"
-  def foreign_key(class_name, separate_class_name_and_id_with_underscore = true)
-    underscore(demodulize(class_name)) + (separate_class_name_and_id_with_underscore ? "_id" : "id")
-  end
-
-  # Constantize tries to find a declared constant with the name specified
-  # in the string. It raises a NameError when the name is not in CamelCase
-  # or is not initialized.
-  #
-  # Examples
-  #   "Module".constantize #=> Module
-  #   "Class".constantize #=> Class
-  def constantize(camel_cased_word)
-    unless /\A(?:::)?([A-Z]\w*(?:::[A-Z]\w*)*)\z/ =~ camel_cased_word
-      raise NameError, "#{camel_cased_word.inspect} is not a valid constant name!"
-    end
-
-    Object.module_eval("::#{$1}", __FILE__, __LINE__)
-  end
-
-  # Ordinalize turns a number into an ordinal string used to denote the
-  # position in an ordered sequence such as 1st, 2nd, 3rd, 4th.
-  #
-  # Examples
-  #   ordinalize(1)     # => "1st"
-  #   ordinalize(2)     # => "2nd"
-  #   ordinalize(1002)  # => "1002nd"
-  #   ordinalize(1003)  # => "1003rd"
-  def ordinalize(number)
-    if (11..13).include?(number.to_i % 100)
-      "#{number}th"
-    else
-      case number.to_i % 10
-        when 1; "#{number}st"
-        when 2; "#{number}nd"
-        when 3; "#{number}rd"
-        else    "#{number}th"
-      end
-    end
-  end
-end
-
-require File.dirname(__FILE__) + '/inflections'
diff --git a/bundles/ruby-on-rails.tmbundle/Support/lib/rails/misc.rb b/bundles/ruby-on-rails.tmbundle/Support/lib/rails/misc.rb
deleted file mode 100755
index 6a0a2b081..000000000
--- a/bundles/ruby-on-rails.tmbundle/Support/lib/rails/misc.rb
+++ /dev/null
@@ -1,61 +0,0 @@
-class String
-  # Gets the line number of character +i+ (0-base index)
-  def line_from_index(i)
-    slice(0..i).count("\n")
-  end
-
-  # Gets the index of the beginning of line number +l+ (0-base index)
-  def index_from_line(l)
-    to_a.slice(0...l).join.length
-  end
-
-  # Temporarily replace "strings" with (parens) and :symbols with .notation.
-  # Useful before a find_nearest_string_or_symbol search when method calls have
-  # special meaning for lists of strings or symbols (e.g. javascript_include_tag)
-  def unstringify_hash_arguments
-    gsub(/'([^']+?)'(?=\s*=>)/, '(\1)').
-    gsub(/"([^"]+?)"(?=\s*=>)/, '(\1)').
-    gsub(/:(\w+)(?=\s*=>)/, '.\1').
-    gsub(/(=>\s*)'([^']+?)'/, '\1(\2)').
-    gsub(/(=>\s*)"([^"]+?)"/, '\1(\2)').
-    gsub(/(=>\s*):(\w+)/, '\1.\2')
-  end
-
-  # Finds the nearest "string" or :symbol to +column_number+
-  def find_nearest_string_or_symbol(column_number)
-    re = /'([^']+?)'|"([^"]+)"|:([a-zA-Z0-9_]+)\b/
-    matching_tokens = scan(re).flatten.compact
-    # Which token is nearest to column_number?
-    nearest_token = nearest_index = distance = nil
-    matching_tokens.each do |token|
-      i = index(token, column_number)
-      if i and (distance.nil? or (column_number - i).abs < distance)
-        nearest_token = token
-        nearest_index = i
-        distance = (column_number - i).abs
-      end
-
-      i = rindex(token, column_number)
-      if i and (distance.nil? or ((column_number - i).abs - token.length) < distance)
-        nearest_token = token
-        nearest_index = i
-        distance = (column_number - i).abs - token.length
-      end
-    end
-    (nearest_token.nil?) ? nil : [nearest_token, nearest_index]
-  end
-
-  def underscore
-    gsub(/::/, '/').
-      gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
-      gsub(/([a-z\d])([A-Z])/,'\1_\2').
-      tr("-", "_").
-      downcase
-  end
-
-  def camelize
-    gsub(/\/(.?)/) { "::" + $1.upcase }.gsub(/(^|_)(.)/) { $2.upcase }
-  end
-  alias camelcase camelize
-end
-
diff --git a/bundles/ruby-on-rails.tmbundle/Support/lib/rails/rails_path.rb b/bundles/ruby-on-rails.tmbundle/Support/lib/rails/rails_path.rb
deleted file mode 100644
index 98ac7092c..000000000
--- a/bundles/ruby-on-rails.tmbundle/Support/lib/rails/rails_path.rb
+++ /dev/null
@@ -1,318 +0,0 @@
-# Copyright:
-#   (c) 2006 syncPEOPLE, LLC.
-#   Visit us at http://syncpeople.com/
-# Author: Duane Johnson (duane.johnson@gmail.com)
-# Description:
-#   Makes analyzing of a Rails path + filename easier.
-
-require 'rails/misc'
-require 'rails/text_mate'
-require 'rails/buffer'
-require 'rails/inflector'
-require 'fileutils'
-
-module AssociationMessages
-  @@associations = {
-    :controller => [:functional_test, :helper, :model, :javascript, :stylesheet, :fixture],
-    :helper => [:controller, :model, :unit_test, :functional_test, :javascript, :stylesheet, :fixture],
-    :view => [:controller, :javascript, :stylesheet, :helper, :model],
-    :model => [:unit_test, :functional_test, :controller, :helper, :fixture],
-    :fixture => [:unit_test, :functional_test, :controller, :helper, :model],
-    :functional_test => [:controller, :helper, :model, :unit_test, :fixture],
-    :unit_test => [:model, :controller, :helper, :functional_test, :fixture],
-    :javascript => [:helper, :controller],
-    :stylesheet => [:helper, :controller]
-  }
-
-  # Make associations hash publicly available to each object
-  def associations; self.class.class_eval("@@associations") end
-
-  # Return associated_with_*? methods
-  def method_missing(method, *args)
-    case method.to_s
-    when /^associated_with_(.+)\?$/
-      return associations[$1.to_sym].include?(file_type)
-    else
-      super(method, *args)
-    end
-  end
-
-  def best_match
-    return nil if associations[file_type].nil?
-    return :view if file_type == :controller && action_name
-    associations[file_type].each { |x| return x if rails_path_for(x).exists? }
-    return associations[file_type].first
-  end
-end
-
-class RailsPath
-  attr_reader :filepath
-  attr_reader :path_name, :file_name, :content_type, :extension
-
-  include AssociationMessages
-
-  def initialize(filepath = TextMate.filepath)
-    if filepath[0..0] == '/'
-      # Absolute file, treat as is
-      @filepath = filepath
-    else
-      # Relative file, prepend rails_root
-      @filepath = File.join(rails_root, filepath)
-    end
-
-    # Put parts into instance variables to make retrieval more uniform.
-    parse_file_parts
-  end
-
-  def buffer
-    @buffer ||= Buffer.new_from_file(self)
-  end
-
-  def exists?
-    File.file?(@filepath)
-  end
-
-  def basename
-    File.basename(@filepath)
-  end
-
-  def dirname
-    File.dirname(@filepath)
-  end
-
-  # Make sure the file exists by creating it if it doesn't
-  def touch
-    if !exists?
-      FileUtils.mkdir_p dirname
-      FileUtils.touch @filepath
-    end
-  end
-
-  def append(str)
-    File.open(@filepath, "a") { |f| f.write str }
-  end
-
-  def controller_name
-    name = @file_name
-    # Remove extras
-    case file_type
-    when :controller then name.sub!(/_controller$/, '')
-    when :helper     then name.sub!(/_helper$/, '')
-    when :unit_test  then name.sub!(/_test$/, '')
-    when :view       then name = dirname.split('/').pop
-    when :functional_test then name.sub!(/_controller_test$/, '')
-    else
-      if !File.file?(File.join(rails_root, stubs[:controller], '/', name + '_controller.rb'))
-        name = Inflector.pluralize(name)
-      end
-    end
-    return name
-  end
-
-  def action_name
-    name =
-      case file_type
-      when :controller, :model
-        buffer.find_method(:direction => :backward).last rescue nil
-      when :view
-        basename
-      when :functional_test
-        buffer.find_method(:direction => :backward).last.sub('^test_', '')
-      else nil
-      end
-
-    return parse_file_name(name)[:file_name] rescue nil # Remove extension
-  end
-
-  def respond_to_format
-    return nil unless file_type == :controller
-    buffer.find_respond_to_format
-  end
-
-  def rails_root
-    return TextMate.project_directory
-    # TODO: Look for the root_indicators inside TM_PROJECT_DIRECTORY and return nil if not found
-
-    #self.class.root_indicators.each do |i|
-    #  if index = @filepath.index(i)
-    #    return @filepath[0...index]
-    #  end
-    #end
-  end
-
-  # This is used in :file_type and :rails_path_for_view
-  VIEW_EXTENSIONS = %w( erb builder rhtml rxhtml rxml rjs haml )
-
-  def file_type
-    return @file_type if @file_type
-
-    @file_type =
-      case @filepath
-      when %r{/controllers/(.+_controller\.(rb))$}      then :controller
-      when %r{/controllers/(application\.(rb))$}        then :controller
-      when %r{/helpers/(.+_helper\.rb)$}                then :helper
-      when %r{/views/(.+\.(#{VIEW_EXTENSIONS * '|'}))$} then :view
-      when %r{/models/(.+\.(rb))$}                      then :model
-      when %r{/.+/fixtures/(.+\.(yml|csv))$}            then :fixture
-      when %r{/test/functional/(.+\.(rb))$}             then :functional_test
-      when %r{/test/unit/(.+\.(rb))$}                   then :unit_test
-      when %r{/public/javascripts/(.+\.(js))$}          then :javascript
-      when %r{/public/stylesheets/(?:sass/)?(.+\.(css|sass))$}  then :stylesheet
-      else nil
-      end
-    # Store the tail (modules + file) after the regexp
-    # The first set of parens in each case will become the "tail"
-    @tail = $1
-    # Store the file extension
-    @extension = $2
-    return @file_type
-  end
-
-  def tail
-    # Get the tail if it's not set yet
-    file_type unless @tail
-    return @tail
-  end
-
-  def extension
-    # Get the extension if it's not set yet
-    file_type unless @extension
-    return @extension
-  end
-
-  # View file that does not begin with _
-  def partial?
-    file_type == :view and basename !~ /^_/
-  end
-
-  def modules 
-    return nil if tail.nil? 
-    if file_type == :view
-      tail.split('/').slice(0...-2)
-    else
-      tail.split('/').slice(0...-1)
-    end
-  end
-
-  def controller_name_possibles_modified_for(type)
-    case type
-    when :controller
-      if controller_name == 'application'
-        controller_name
-      else
-        [Inflector.pluralize(controller_name), Inflector.singularize(controller_name)].
-         map { |name| name + '_controller' }
-      end
-    when :helper     then controller_name + '_helper'
-    when :functional_test then controller_name + '_controller_test'
-    when :unit_test  then Inflector.singularize(controller_name) + '_test'
-    when :model      then Inflector.singularize(controller_name)
-    when :fixture    then Inflector.pluralize(controller_name)
-    else controller_name
-    end
-  end
-
-  def select_controller_name(type, base_path, extn)
-    controller_names = controller_name_possibles_modified_for(type)
-    if controller_names.is_a?(Array)
-      for name in controller_names
-        return name if File.exists?(File.join(base_path, name + extn))
-      end
-      controller_names = controller_names.first
-    end
-    controller_names
-  end
-  
-  def default_extension_for(type, view_format = nil)
-    case type
-    when :javascript then ENV['RAILS_JS_EXT'] || '.js'
-    when :stylesheet then ENV['RAILS_CSS_EXT'] || (wants_haml ? '.sass' : '.css')
-    when :view       then                    
-      view_format = :html if view_format.nil?
-      case view_format.to_sym
-      when :xml, :rss, :atom then ".#{view_format}.builder"
-      when :js  then '.js.rjs'
-      else 
-        rails_view_ext = ENV['RAILS_VIEW_EXT'] || (wants_haml ? '.haml' : '.erb')
-        ".#{view_format}#{rails_view_ext}"
-      end
-    when :fixture    then '.yml'
-    else '.rb'
-    end
-  end
-
-  def rails_path_for(type)    
-    return nil if file_type.nil?
-    return rails_path_for_view if type == :view
-    if TextMate.project_directory
-      base_path = File.join(rails_root, stubs[type], modules)
-      extn      = default_extension_for(type)
-      file_name = select_controller_name(type, base_path, extn)
-      RailsPath.new(File.join(base_path, file_name + extn))
-    else
-      puts "There needs to be a project associated with this file."
-    end
-  end
-
-  def rails_path_for_view
-    return nil if action_name.nil?
-    line, view_format = respond_to_format
-
-    if view_format
-      VIEW_EXTENSIONS.each do |ext|
-        filename_with_extension = "#{action_name}.#{view_format}.#{ext}"
-        existing_view = File.join(rails_root, stubs[:view], modules, controller_name, filename_with_extension)
-        return RailsPath.new(existing_view) if File.exist?(existing_view)
-      end
-    end
-    VIEW_EXTENSIONS.each do |ext|
-      filename_with_extension = "#{action_name}.#{ext}"
-      existing_view = File.join(rails_root, stubs[:view], modules, controller_name, filename_with_extension)
-      return RailsPath.new(existing_view) if File.exist?(existing_view)
-    end
-    default_view = File.join(rails_root, stubs[:view], modules, controller_name, action_name + default_extension_for(:view, view_format))
-    return RailsPath.new(default_view)
-  end
-
-  def parse_file_parts
-    @path_name, @file_name = File.split(@filepath)
-    file_part_hash = parse_file_name(@file_name)
-    @file_name = file_part_hash[:file_name]
-    @content_type = file_part_hash[:content_type]
-    @extension = file_part_hash[:extension]
-    return [@path_name, @file_name, @content_type, @extension]
-  end
-
-  # File name parser that has no side-effects on object state
-  def parse_file_name(file_name)
-    path_parts = file_name.split('.')
-    extension = path_parts.pop if path_parts.length > 1
-    content_type = path_parts.pop if path_parts.length > 1
-    file_name = path_parts.join('.')
-    return {:extension => extension, :content_type => content_type, :file_name => file_name}
-  end
-
-  def wants_haml
-    @wants_html ||= File.file?(File.join(rails_root, "vendor/plugins/haml/", "init.rb"))
-  end
-
-  def stubs
-    { :controller => 'app/controllers',
-      :model => 'app/models',
-      :helper => 'app/helpers/',
-      :view => 'app/views/',
-      :config => 'config',
-      :lib => 'lib',
-      :log => 'log',
-      :javascript => 'public/javascripts',
-      :stylesheet => wants_haml ? 'public/stylesheets/sass' : 'public/stylesheets',
-      :functional_test => 'test/functional',
-      :unit_test => 'test/unit',
-      :fixture => 'test/fixtures'}
-  end
-
-  def ==(other)
-    other = other.filepath if other.respond_to?(:filepath)
-    @filepath == other
-  end
-end
\ No newline at end of file
diff --git a/bundles/ruby-on-rails.tmbundle/Support/lib/rails/text_mate.rb b/bundles/ruby-on-rails.tmbundle/Support/lib/rails/text_mate.rb
deleted file mode 100644
index 7f691a4d7..000000000
--- a/bundles/ruby-on-rails.tmbundle/Support/lib/rails/text_mate.rb
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright:
-#   (c) 2006 syncPEOPLE, LLC.
-#   Visit us at http://syncpeople.com/
-# Author: Duane Johnson (duane.johnson@gmail.com)
-# Description:
-#   Helper module for accesing TextMate facilities such as environment variables.
-
-require 'uri'
-module TextMate
-  class <<self
-    def open_url(url)
-      `open "#{url}"`
-    end
-
-    # Open a file in textmate using the txmt:// protocol.  Uses 0-based line and column indices.
-    def open(filename, line_number = nil, column_number = nil)
-      filename = filename.filepath if filename.is_a? RailsPath
-      options = []
-      options << "url=file://#{URI.escape(filename)}"
-      options << "line=#{line_number + 1}" if line_number
-      options << "column=#{column_number + 1}" if column_number
-      open_url "txmt://open?" + options.join("&")
-    end
-
-    # Always return something, or nil, for selected_text
-    def selected_text
-      env(:selected_text)
-    end
-
-    # Make line_number 0-base index
-    def line_number
-      env(:line_number).to_i - 1
-    end
-
-    # Make column_number 0-base as well
-    def column_number
-      env(:column_number).to_i - 1
-    end
-
-    def project_directory
-      env(:project_directory)
-    end
-
-    def env(var)
-      ENV['TM_' + var.to_s.upcase]
-    end
-
-    # Forward to the TM_* environment variables if method is missing.  Some useful variables include:
-    #   selected_text, current_line, column_number, line_number, support_path
-    def method_missing(method, *args)
-      if value = env(method)
-        return value
-      else
-        super(method, *args)
-      end
-    end
-
-    def cocoa_dialog_command
-      "#{support_path}/bin/CocoaDialog.app/Contents/MacOS/CocoaDialog"
-    end
-
-    # See http://cocoadialog.sourceforge.net/documentation.html for documentation
-    def cocoa_dialog(command, options = {})
-      options_list = []
-      options.each_pair do |k, v|
-        k = k.to_s.gsub('_', '-')
-        value = v.is_a?(Array) ? %Q{"#{v.join('" "')}"} : "\"#{v}\""
-        if v
-          if v.is_a? TrueClass
-            options_list << "--#{k}"
-          else
-            options_list << "--#{k} #{value}"
-          end
-        end
-      end
-      dialog_command = "\"#{cocoa_dialog_command}\" #{command} #{options_list.join(' ')}"
-      # $logger.debug "Dialog command: #{dialog_command}"
-      `#{dialog_command}`.to_a.map { |v| v.strip }
-    end
-
-    def choose(text, choices = ["none"], options = {})
-      options = {:title => "Choose", :text => text, :items => choices, :button1 => 'Ok', :button2 => 'Cancel'}.update(options)
-      button, choice = cocoa_dialog('dropdown', options)
-      if button == '1'
-        return choice.strip.to_i
-      else
-        return nil
-      end
-    end
-  end
-end
diff --git a/bundles/ruby-on-rails.tmbundle/Support/lib/rails/unobtrusive_logger.rb b/bundles/ruby-on-rails.tmbundle/Support/lib/rails/unobtrusive_logger.rb
deleted file mode 100644
index 535a6e8c3..000000000
--- a/bundles/ruby-on-rails.tmbundle/Support/lib/rails/unobtrusive_logger.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright:
-#   (c) 2006 syncPEOPLE, LLC.
-#   Visit us at http://syncpeople.com/
-# Author: Duane Johnson (duane.johnson@gmail.com)
-# Description:
-#   Simple delegate class for Logger.  Its purpose is to prevent littering the
-#   home directory with log files.  Useful for testing / development of bundles.
-
-require 'logger'
-
-class UnobtrusiveLogger
-  attr_accessor :filename, :logger
-  def initialize(filename)
-    @filename = filename
-    @logger = nil
-  end
-  def method_missing(method, *args)
-    @logger = Logger.new(@filename) unless @logger
-    @logger.send(method, *args)
-  end
-end
-
-$logger = UnobtrusiveLogger.new("/tmp/textmate_rails_bundle.log")
diff --git a/bundles/ruby-on-rails.tmbundle/Support/lib/rails_bundle_tools.rb b/bundles/ruby-on-rails.tmbundle/Support/lib/rails_bundle_tools.rb
deleted file mode 100644
index efbe75141..000000000
--- a/bundles/ruby-on-rails.tmbundle/Support/lib/rails_bundle_tools.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright:
-#   (c) 2006 syncPEOPLE, LLC.
-#   Visit us at http://syncpeople.com/
-# Author: Duane Johnson (duane.johnson@gmail.com)
-# Description:
-#   Collection of Rails / TextMate classes for Ruby.
-
-bundle_lib = ENV['TM_BUNDLE_SUPPORT'] + '/lib'
-$LOAD_PATH.unshift(bundle_lib) if ENV['TM_BUNDLE_SUPPORT'] and !$LOAD_PATH.include?(bundle_lib)
-
-require ENV['TM_SUPPORT_PATH'] + '/lib/exit_codes'
-require ENV['TM_SUPPORT_PATH'] + '/lib/textmate'
-require ENV['TM_SUPPORT_PATH'] + '/lib/ui'
-
-require 'rails/text_mate'
-require 'rails/rails_path'
-require 'rails/unobtrusive_logger'
-require 'rails/misc'
-require 'rails/inflector'
-
-def ruby(command)
-  `/usr/bin/env ruby #{command}`
-end
diff --git a/bundles/ruby-on-rails.tmbundle/Support/plugins/footnotes-edge/init.rb b/bundles/ruby-on-rails.tmbundle/Support/plugins/footnotes-edge/init.rb
deleted file mode 100644
index 920841b2c..000000000
--- a/bundles/ruby-on-rails.tmbundle/Support/plugins/footnotes-edge/init.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright:
-#   (c) 2006 InquiryLabs, Inc.
-#   Visit us at http://inquirylabs.com/
-# Version: 2.0
-# License: MIT
-# Author: Duane Johnson (duane.johnson@gmail.com)
-# Description:
-#   Creates clickable footnotes on each rendered page, as well as clickable
-#   links in the backtrace should an error occur in your Rails app.  Links take
-#   you to the right place inside TextMate.
-
-# Enable only the TextMate on Macs in development mode
-if (ENV['RAILS_ENV'] == 'development')
-  # Windows doesn't have 'uname', so rescue false
-  ::MAC_OS_X = (`uname`.chomp == "Darwin") rescue false
-  require 'textmate_footnotes'
-  require 'textmate_initialize'
-
-  require 'textmate_backtracer' if ::MAC_OS_X
-end
\ No newline at end of file
diff --git a/bundles/ruby-on-rails.tmbundle/Support/plugins/footnotes-edge/lib/textmate_backtracer.rb b/bundles/ruby-on-rails.tmbundle/Support/plugins/footnotes-edge/lib/textmate_backtracer.rb
deleted file mode 100644
index 421ba04e2..000000000
--- a/bundles/ruby-on-rails.tmbundle/Support/plugins/footnotes-edge/lib/textmate_backtracer.rb
+++ /dev/null
@@ -1,42 +0,0 @@
-class Exception
-  alias :original_clean_backtrace :clean_backtrace
-
-  def add_links_to_backtrace(lines)
-    lines.collect do |line|
-      expanded = line.gsub '#{RAILS_ROOT}', RAILS_ROOT
-      if match = expanded.match(/^(.+):(\d+):in/) or match = expanded.match(/^(.+):(\d+)\s*$/)
-        file = File.expand_path(match[1])
-        line_number = match[2]
-        html = "<a href='txmt://open?url=file://#{file}&line=#{line_number}'>#{line}</a>"
-      else
-        line
-      end
-    end
-  end
-
-  def clean_backtrace
-    add_links_to_backtrace(original_clean_backtrace)
-  end
-end
-
-module ActionView
-  class TemplateError < ActionViewError
-    def line_number_link
-      file = File.expand_path(@file_path)
-      "<a href='txmt://open?url=file://#{file}&line=#{line_number}'>#{line_number}</a>"
-    end
-  end
-end
-
-class ActionController::Base
-protected
-  alias backtracer_original_template_path_for_local_rescue template_path_for_local_rescue
-  def template_path_for_local_rescue(exception)
-    if ActionView::TemplateError === exception
-      File.dirname(__FILE__) + "/../templates/rescues/template_error.erb"
-    else
-      backtracer_original_template_path_for_local_rescue(exception)
-    end
-  end
-
-end
diff --git a/bundles/ruby-on-rails.tmbundle/Support/plugins/footnotes-edge/lib/textmate_footnotes.rb b/bundles/ruby-on-rails.tmbundle/Support/plugins/footnotes-edge/lib/textmate_footnotes.rb
deleted file mode 100644
index ca5549baa..000000000
--- a/bundles/ruby-on-rails.tmbundle/Support/plugins/footnotes-edge/lib/textmate_footnotes.rb
+++ /dev/null
@@ -1,257 +0,0 @@
-class String
-  def line_from_index(index)
-    lines = self.to_a
-    running_length = 0
-    lines.each_with_index do |line, i|
-      running_length += line.length
-      if running_length > index
-        return i
-      end
-    end
-  end
-end
-
-class FootnoteFilter
-  cattr_accessor :no_style, :abs_root, :textmate_prefix
-  self.no_style = false
-  self.textmate_prefix = "txmt://open?url=file://"
-
-  attr_accessor :body, :abs_root
-
-  def self.filter(controller)
-    return if controller.render_without_footnotes
-    filter = FootnoteFilter.new(controller)
-    filter.add_footnotes!
-  end
-
-  def initialize(controller)
-    @controller = controller
-    @template = controller.instance_variable_get("@template")
-    @body = controller.response.body
-    @extra_html = ""
-    self.abs_root = File.expand_path(RAILS_ROOT)
-  end
-
-  def add_footnotes!
-    if performed_render? and first_render?
-      if ["html.erb", "haml", "rhtml", "rxhtml"].include?(template_extension) && (content_type =~ /html/ || content_type.nil?) && !xhr?
-        # If the user would like to be responsible for the styles, let them opt out of the styling here
-        insert_styles unless FootnoteFilter.no_style
-        insert_footnotes
-      end
-    end
-  rescue Exception => e
-    # Discard footnotes if there are any problems
-    RAILS_DEFAULT_LOGGER.error "Textmate Footnotes Exception: #{e}\n#{e.backtrace.join("\n")}"
-  end
-
-  # Some controller classes come with the Controller:: module and some don't
-  # (anyone know why? -- Duane)
-  def controller_filename
-    File.join(abs_root, "app", "controllers", "#{@controller.class.to_s.underscore}.rb").
-    sub('/controllers/controllers/', '/controllers/')
-  end
-
-  def controller_text
-    @controller_text ||= IO.read(controller_filename)
-  end
-
-  def index_of_method
-    (controller_text =~ /def\s+#{@controller.action_name}[\s\(]/)
-  end
-
-  def controller_line_number
-    controller_text.line_from_index(index_of_method)
-  end
-
-  def performed_render?
-    @controller.instance_variable_get("@performed_render")
-  end
-
-  def first_render?
-    @template.respond_to?(:first_render) and @template.first_render
-  end
-
-  def xhr?
-    @controller.request.xhr?
-  end
-
-  def template_path
-    @template.first_render.sub(/\.(html\.erb|rhtml|rxhtml|rxml|rjs)$/, "")
-  end
-
-  def template_extension
-    @template.first_render.scan(/\.(html\.erb|rhtml|rxhtml|rxml|rjs)$/).flatten.first ||
-    @template.pick_template_extension(template_path).to_s
-  end
-
-  def template_file_name
-    File.expand_path(@template.send(:full_template_path, template_path, template_extension))
-  end
-
-  def layout_file_name
-    ["html.erb", "rhtml"].each do |extension|
-      path = File.expand_path(@template.send(:full_template_path, @controller.active_layout, extension))
-      return path if File.exist?(path)
-    end
-  end
-
-  def content_type
-    @controller.response.headers['Content-Type']
-  end
-
-  def stylesheet_files
-    @stylesheet_files ||= @body.scan(/<link[^>]+href\s*=\s*['"]([^>?'"]+)/im).flatten
-  end
-
-  def javascript_files
-    @javascript_files ||= @body.scan(/<script[^>]+src\s*=\s*['"]([^>?'"]+)/im).flatten
-  end
-
-  def controller_url
-    escape(
-      textmate_prefix +
-      controller_filename +
-      (index_of_method ? "&line=#{controller_line_number + 1}&column=3" : "")
-    )
-  end
-
-  def view_url
-    escape(textmate_prefix + template_file_name)
-  end
-
-  def layout_url
-    escape(textmate_prefix + layout_file_name)
-  end
-
-  def insert_styles
-    insert_text :before, /<\/head>/i, <<-HTML
-    <!-- TextMate Footnotes Style -->
-    <style type="text/css">
-      #tm_footnotes_debug {margin-top: 0.5em; text-align: center; color: #999;}
-      #tm_footnotes_debug a {text-decoration: none; color: #bbb;}
-      #tm_footnotes_debug pre {overflow: scroll;}
-      fieldset.tm_footnotes_debug_info {text-align: left; border: 1px dashed #aaa; padding: 1em; margin: 1em 2em 1em 2em; color: #777;}
-    </style>
-    <!-- End TextMate Footnotes Style -->
-    HTML
-  end
-
-  def insert_footnotes
-
-    def tm_footnotes_toggle(id)
-      "s = document.getElementById('#{id}').style; if(s.display == 'none') { s.display = '' } else { s.display = 'none' }"
-    end
-
-    footnotes_html = <<-HTML
-    <!-- TextMate Footnotes -->
-    <div style="clear:both"></div>
-    <div id="tm_footnotes_debug">
-      #{textmate_links}
-      Show:
-      <a href="#" onclick="#{tm_footnotes_toggle('session_debug_info')};return false">Session</a> |
-      <a href="#" onclick="#{tm_footnotes_toggle('cookies_debug_info')};return false">Cookies</a> |
-      <a href="#" onclick="#{tm_footnotes_toggle('params_debug_info')};return false">Params</a> |
-      <a href="#" onclick="#{tm_footnotes_toggle('general_debug_info')};return false">General Debug</a>
-      <br/>(<a href="http://blog.inquirylabs.com/2006/09/28/textmate-footnotes-v16-released/"><b>TextMate Footnotes</b></a>)
-      #{@extra_html}
-      <fieldset id="session_debug_info" class="tm_footnotes_debug_info" style="display: none">
-        <legend>Session</legend>
-        #{escape(@controller.session.instance_variable_get("@data").inspect)}
-      </fieldset>
-      <fieldset id="cookies_debug_info" class="tm_footnotes_debug_info" style="display: none">
-        <legend>Cookies</legend>
-        <code>#{escape(@controller.send(:cookies).inspect)}</code>
-      </fieldset>
-      <fieldset id="params_debug_info" class="tm_footnotes_debug_info" style="display: none">
-        <legend>Params</legend>
-        <code>#{escape(@controller.params.inspect)}</code>
-      </fieldset>
-      <fieldset id="general_debug_info" class="tm_footnotes_debug_info" style="display: none">
-        <legend>General (id="tm_debug")</legend>
-        <div id="tm_debug"></div>
-      </fieldset>
-    </div>
-    <!-- End TextMate Footnotes -->
-    HTML
-    if @body =~ %r{<div[^>]+id=['"]tm_footnotes['"][^>]*>}
-      # Insert inside the "tm_footnotes" div if it exists
-      insert_text :after, %r{<div[^>]+id=['"]tm_footnotes['"][^>]*>}, footnotes_html
-    else
-      # Otherwise, try to insert as the last part of the html body
-      insert_text :before, /<\/body>/i, footnotes_html
-    end
-  end
-
-  def textmate_links
-    html = ""
-    if ::MAC_OS_X
-      html = <<-HTML
-        Edit:
-        <a href="#{controller_url}">Controller</a> |
-        <a href="#{view_url}">View</a> |
-        <a href="#{layout_url}">Layout</a>
-      HTML
-      html += asset_file_links("Stylesheets", stylesheet_files) unless stylesheet_files.blank?
-      html += asset_file_links("Javascripts", javascript_files) unless javascript_files.blank?
-      html += "<br/>"
-    end
-    html
-  end
-
-  def asset_file_links(link_text, files)
-    return '' if files.size == 0
-    links = files.map do |filename|
-      if filename =~ %r{^/}
-        full_filename = File.join(abs_root, "public", filename)
-        %{<a href="#{textmate_prefix}#{full_filename}">#{filename}</a>}
-      else
-        %{<a href="#{filename}">#{filename}</a>}
-      end
-    end
-    @extra_html << <<-HTML
-      <fieldset id="tm_footnotes_#{link_text.underscore.gsub(' ', '_')}" class="tm_footnotes_debug_info" style="display: none">
-        <legend>#{link_text}</legend>
-        <ul><li>#{links.join("</li><li>")}</li></ul>
-      </fieldset>
-    HTML
-    # Return the link that will open the 'extra html' div
-    %{ | <a href="#" onclick="#{tm_footnotes_toggle('tm_footnotes_' + link_text.underscore.gsub(' ', '_') )}; return false">#{link_text}</a>}
-  end
-
-  def indent(indentation, text)
-    lines = text.to_a
-    initial_indentation = lines.first.scan(/^(\s+)/).flatten.first
-    lines.map do |line|
-      if initial_indentation.nil?
-        " " * indentation + line
-      elsif line.index(initial_indentation) == 0
-        " " * indentation + line[initial_indentation.size..-1]
-      else
-        " " * indentation + line
-      end
-    end.join
-  end
-
-  # Inserts text in to the body of the document
-  # +pattern+ is a Regular expression which, when matched, will cause +new_text+
-  # to be inserted before or after the match.  If no match is found, +new_text+ is appended
-  # to the body instead. +position+ may be either :before or :after
-  def insert_text(position, pattern, new_text, indentation = 4)
-    index = case pattern
-      when Regexp
-        if match = @body.match(pattern)
-          match.offset(0)[position == :before ? 0 : 1]
-        else
-          @body.size
-        end
-      else
-        pattern
-      end
-    @body.insert index, indent(indentation, new_text)
-  end
-
-  def escape(text)
-    text.gsub("&", "&amp;").gsub("<", "&lt;").gsub(">", "&gt;")
-  end
-end
\ No newline at end of file
diff --git a/bundles/ruby-on-rails.tmbundle/Support/plugins/footnotes-edge/lib/textmate_initialize.rb b/bundles/ruby-on-rails.tmbundle/Support/plugins/footnotes-edge/lib/textmate_initialize.rb
deleted file mode 100644
index 159d01a08..000000000
--- a/bundles/ruby-on-rails.tmbundle/Support/plugins/footnotes-edge/lib/textmate_initialize.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-class ActionController::Base
-  attr_accessor :render_without_footnotes
-
-  after_filter FootnoteFilter
-
-protected
-  alias footnotes_original_render render
-  def render(options = nil, deprecated_status = nil, &block) #:doc:
-    if options.is_a? Hash
-      @render_without_footnotes = (options.delete(:footnotes) == false)
-    end
-    footnotes_original_render(options, deprecated_status, &block)
-  end
-end
diff --git a/bundles/ruby-on-rails.tmbundle/Support/plugins/footnotes-edge/templates/rescues/template_error.erb b/bundles/ruby-on-rails.tmbundle/Support/plugins/footnotes-edge/templates/rescues/template_error.erb
deleted file mode 100644
index 8451c12b9..000000000
--- a/bundles/ruby-on-rails.tmbundle/Support/plugins/footnotes-edge/templates/rescues/template_error.erb
+++ /dev/null
@@ -1,21 +0,0 @@
-<h1>
-  <%=h @exception.original_exception.class.to_s %> in
-  <%=h request.parameters["controller"].capitalize if request.parameters["controller"]%>#<%=h request.parameters["action"] %>
-</h1>
-
-<p>
-  Showing <i><%=h @exception.file_name %></i> where line <b>#<%= @exception.line_number_link rescue @exception.line_number %></b> raised:
-  <pre><code><%=h @exception.message %></code></pre>
-</p>
-
-<p>Extracted source (around line <b>#<%= @exception.line_number_link rescue @exception.line_number %></b>):
-<pre><code><%=h @exception.source_extract %></code></pre></p>
-
-<p><%=h @exception.sub_template_message %></p>
-
-<% @real_exception = @exception
-   @exception = @exception.original_exception || @exception %>
-<%= render_file(@rescues_path + "/_trace.erb", false) %>
-<% @exception = @real_exception %>
-
-<%= render_file(@rescues_path + "/_request_and_response.erb", false) %>
diff --git a/bundles/ruby-on-rails.tmbundle/Support/plugins/footnotes-edge/test/mock_controller.rb b/bundles/ruby-on-rails.tmbundle/Support/plugins/footnotes-edge/test/mock_controller.rb
deleted file mode 100644
index 813a2aaf1..000000000
--- a/bundles/ruby-on-rails.tmbundle/Support/plugins/footnotes-edge/test/mock_controller.rb
+++ /dev/null
@@ -1,65 +0,0 @@
-require 'ostruct'
-
-RAILS_ROOT.replace File.dirname(__FILE__)
-::MAC_OS_X = (`uname`.chomp == "Darwin") rescue false
-
-class MockController
-  attr_accessor :template, :session, :params, :cookies
-
-  def initialize(body = "")
-    @body = body
-    @performed_render = true
-    @params = {:controller => 'test', :action => 'example'}
-    @session = {}
-    @cookies = {}
-    template
-  end
-
-  def template
-    @template ||= MockTemplate.new(self)
-  end
-
-  def response
-    @response ||= OpenStruct.new(:body => @body, :headers => {})
-  end
-
-  def first_render
-    @body
-  end
-
-  def request
-    @request ||= MockRequest.new(false)
-  end
-
-  def action_name
-    @params[:action]
-  end
-end
-
-class MockTemplate
-  def initialize(controller)
-    @controller = controller
-  end
-
-  def first_render
-    "example.rhtml"
-  end
-end
-
-class MockRequest < OpenStruct.new(:xhr)
-  alias_method :xhr?, :xhr
-end
-
-class FootnoteFilter
-  def controller_filename
-    __FILE__
-  end
-
-  def template_file_name
-    __FILE__
-  end
-
-  def layout_file_name
-    __FILE__
-  end
-end
\ No newline at end of file
diff --git a/bundles/ruby-on-rails.tmbundle/Support/plugins/footnotes-edge/test/textmate_footnotes_test.rb b/bundles/ruby-on-rails.tmbundle/Support/plugins/footnotes-edge/test/textmate_footnotes_test.rb
deleted file mode 100644
index 467408b1f..000000000
--- a/bundles/ruby-on-rails.tmbundle/Support/plugins/footnotes-edge/test/textmate_footnotes_test.rb
+++ /dev/null
@@ -1,85 +0,0 @@
-require 'test/unit'
-require File.dirname(__FILE__) + '/../../../../config/environment'
-
-require File.dirname(__FILE__) + '/../lib/textmate_footnotes'
-require File.dirname(__FILE__) + '/mock_controller'
-
-$html = DATA.read
-
-class TextmateFootnotesTest < Test::Unit::TestCase
-  def setup
-    @controller = MockController.new $html.dup
-    @footnote = FootnoteFilter.new(@controller)
-  end
-
-  def test_mock_controller
-    index = @controller.response.body.index(/This is the HTML page/)
-    assert_equal 334, index
-  end
-
-  def test_footnote_not_included_when_request_is_xhr
-    @controller.request.xhr = true
-    @footnote.add_footnotes!
-    assert_equal $html, @controller.response.body
-  end
-
-  def test_footnote_not_included_when_content_type_is_javascript
-    @controller.response.headers['Content-Type'] = 'text/javascript'
-    @footnote.add_footnotes!
-    assert_equal $html, @controller.response.body
-  end
-
-  def test_footnote_included_when_content_type_is_html
-    @controller.response.headers['Content-Type'] = 'text/html'
-    @footnote.add_footnotes!
-    assert_not_equal $html, @controller.response.body
-  end
-
-  def test_footnote_included_when_content_type_is_nil
-    @footnote.add_footnotes!
-    assert_not_equal $html, @controller.response.body
-  end
-
-  def test_indent
-    before = "text\n  one\n  two"
-    after  = "  text\n    one\n    two"
-
-    assert_equal after, @footnote.indent(2, before)
-
-    before = " text\n  one\n  two"
-    after  = "  text\n   one\n   two"
-
-    assert_equal after, @footnote.indent(2, before)
-
-    before = "  text\none\ntwo"
-    after  = "  text\n  one\n  two"
-
-    assert_equal after, @footnote.indent(2, before)
-  end
-
-  def test_insert_text
-    @footnote.insert_text :after, /<head>/, "Graffiti", 0
-    after = "    <head>Graffiti\n"
-    assert_equal after, @footnote.body.to_a[2]
-
-    @footnote.insert_text :before, /<\/body>/, "Notes", 0
-    after = "    Notes</body>\n"
-    assert_equal after, @footnote.body.to_a[12]
-  end
-end
-
-__END__
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-    <head>
-        <title>HTML to XHTML Example: HTML page</title>
-        <link rel="Stylesheet" href="htmltohxhtml.css" type="text/css" media="screen">
-        <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
-    </head>
-    <body>
-        <p>This is the HTML page. It works and is encoded just like any HTML page you
-         have previously done. View <a href="htmltoxhtml2.htm">the XHTML version</a> of
-         this page to view the difference between HTML and XHTML.</p>
-        <p>You will be glad to know that no changes need to be made to any of your CSS files.</p>
-    </body>
-</html>
\ No newline at end of file
diff --git a/bundles/ruby-on-rails.tmbundle/Support/plugins/footnotes/init.rb b/bundles/ruby-on-rails.tmbundle/Support/plugins/footnotes/init.rb
deleted file mode 100644
index 920841b2c..000000000
--- a/bundles/ruby-on-rails.tmbundle/Support/plugins/footnotes/init.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright:
-#   (c) 2006 InquiryLabs, Inc.
-#   Visit us at http://inquirylabs.com/
-# Version: 2.0
-# License: MIT
-# Author: Duane Johnson (duane.johnson@gmail.com)
-# Description:
-#   Creates clickable footnotes on each rendered page, as well as clickable
-#   links in the backtrace should an error occur in your Rails app.  Links take
-#   you to the right place inside TextMate.
-
-# Enable only the TextMate on Macs in development mode
-if (ENV['RAILS_ENV'] == 'development')
-  # Windows doesn't have 'uname', so rescue false
-  ::MAC_OS_X = (`uname`.chomp == "Darwin") rescue false
-  require 'textmate_footnotes'
-  require 'textmate_initialize'
-
-  require 'textmate_backtracer' if ::MAC_OS_X
-end
\ No newline at end of file
diff --git a/bundles/ruby-on-rails.tmbundle/Support/plugins/footnotes/lib/textmate_backtracer.rb b/bundles/ruby-on-rails.tmbundle/Support/plugins/footnotes/lib/textmate_backtracer.rb
deleted file mode 100644
index 7f66f663b..000000000
--- a/bundles/ruby-on-rails.tmbundle/Support/plugins/footnotes/lib/textmate_backtracer.rb
+++ /dev/null
@@ -1,42 +0,0 @@
-class Exception
-  alias :original_clean_backtrace :clean_backtrace
-
-  def add_links_to_backtrace(lines)
-    lines.collect do |line|
-      expanded = line.gsub '#{RAILS_ROOT}', RAILS_ROOT
-      if match = expanded.match(/^(.+):(\d+):in/) or match = expanded.match(/^(.+):(\d+)\s*$/)
-        file = File.expand_path(match[1])
-        line_number = match[2]
-        html = "<a href='txmt://open?url=file://#{file}&line=#{line_number}'>#{line}</a>"
-      else
-        line
-      end
-    end
-  end
-
-  def clean_backtrace
-    add_links_to_backtrace(original_clean_backtrace)
-  end
-end
-
-module ActionView
-  class TemplateError < ActionViewError
-    def line_number_link
-      file = File.expand_path(@file_name)
-      "<a href='txmt://open?url=file://#{file}&line=#{line_number}'>#{line_number}</a>"
-    end
-  end
-end
-
-class ActionController::Base
-protected
-  alias backtracer_original_template_path_for_local_rescue template_path_for_local_rescue
-  def template_path_for_local_rescue(exception)
-    if ActionView::TemplateError === exception
-      File.dirname(__FILE__) + "/../templates/rescues/template_error.rhtml"
-    else
-      backtracer_original_template_path_for_local_rescue(exception)
-    end
-  end
-
-end
diff --git a/bundles/ruby-on-rails.tmbundle/Support/plugins/footnotes/lib/textmate_footnotes.rb b/bundles/ruby-on-rails.tmbundle/Support/plugins/footnotes/lib/textmate_footnotes.rb
deleted file mode 100644
index 60b2f3a4c..000000000
--- a/bundles/ruby-on-rails.tmbundle/Support/plugins/footnotes/lib/textmate_footnotes.rb
+++ /dev/null
@@ -1,264 +0,0 @@
-class String
-  def line_from_index(index)
-    lines = self.to_a
-    running_length = 0
-    lines.each_with_index do |line, i|
-      running_length += line.length
-      if running_length > index
-        return i
-      end
-    end
-  end
-end
-
-class FootnoteFilter
-  cattr_accessor :no_style, :abs_root, :textmate_prefix
-  self.no_style = false
-  self.textmate_prefix = "txmt://open?url=file://"
-
-  attr_accessor :body, :abs_root
-
-  def self.filter(controller)
-    return if controller.render_without_footnotes
-    filter = FootnoteFilter.new(controller)
-    filter.add_footnotes!
-  end
-
-  def initialize(controller)
-    @controller = controller
-    @template = controller.instance_variable_get("@template")
-    @body = controller.response.body
-    @extra_html = ""
-    self.abs_root = File.expand_path(RAILS_ROOT)
-  end
-
-  def add_footnotes!
-    if performed_render? and first_render?
-      if ["rhtml", "rxhtml"].include?(template_extension) && (content_type =~ /html/ || content_type.nil?) && !xhr?
-        # If the user would like to be responsible for the styles, let them opt out of the styling here
-        insert_styles unless FootnoteFilter.no_style
-        insert_footnotes
-      end
-    end
-  rescue Exception => e
-    # Discard footnotes if there are any problems
-    RAILS_DEFAULT_LOGGER.error "Textmate Footnotes Exception: #{e}\n#{e.backtrace.join("\n")}"
-  end
-
-  # Some controller classes come with the Controller:: module and some don't
-  # (anyone know why? -- Duane)
-  def controller_filename
-    File.join(abs_root, "app", "controllers", "#{@controller.class.to_s.underscore}.rb").
-    sub('/controllers/controllers/', '/controllers/')
-  end
-
-  def controller_text
-    @controller_text ||= IO.read(controller_filename)
-  end
-
-  def index_of_method
-    (controller_text =~ /def\s+#{@controller.action_name}[\s\(]/)
-  end
-
-  def controller_line_number
-    controller_text.line_from_index(index_of_method)
-  end
-
-  def performed_render?
-    @controller.instance_variable_get("@performed_render")
-  end
-
-  def first_render?
-    @template.respond_to?(:first_render) and @template.first_render
-  end
-
-  def xhr?
-    @controller.request.xhr?
-  end
-
-  def template_path
-    @template.first_render.sub(/\.(rhtml|rxhtml|rxml|rjs)$/, "")
-  end
-
-  def template_extension
-    @template.first_render.scan(/\.(rhtml|rxhtml|rxml|rjs)$/).flatten.first ||
-    @template.pick_template_extension(template_path).to_s
-  end
-
-  def template_file_name
-    File.expand_path(@template.send(:full_template_path, template_path, template_extension))
-  end
-
-  def layout_file_name
-    File.expand_path(@template.send(:full_template_path, @controller.active_layout, "rhtml"))
-  end
-
-  def content_type
-    @controller.response.headers['Content-Type']
-  end
-
-  def stylesheet_files
-    @stylesheet_files ||= @body.scan(/<link[^>]+href\s*=\s*['"]([^>?'"]+)/im).flatten
-  end
-
-  def javascript_files
-    @javascript_files ||= @body.scan(/<script[^>]+src\s*=\s*['"]([^>?'"]+)/im).flatten
-  end
-
-  def controller_url
-    escape(
-      textmate_prefix +
-      controller_filename +
-      (index_of_method ? "&line=#{controller_line_number + 1}&column=3" : "")
-    )
-  end
-
-  def view_url
-    escape(textmate_prefix + template_file_name)
-  end
-
-  def layout_url
-    escape(textmate_prefix + layout_file_name)
-  end
-
-  def insert_styles
-    insert_text :before, /<\/head>/i, <<-HTML
-    <!-- TextMate Footnotes Style -->
-    <style type="text/css">
-      #tm_footnotes_debug {margin-top: 0.5em; text-align: center; color: #999;}
-      #tm_footnotes_debug a {text-decoration: none; color: #bbb;}
-      #tm_footnotes_debug pre {overflow: scroll;}
-      fieldset.tm_footnotes_debug_info {text-align: left; border: 1px dashed #aaa; padding: 1em; margin: 1em 2em 1em 2em; color: #777;}
-    </style>
-    <!-- End TextMate Footnotes Style -->
-    HTML
-  end
-
-  def insert_footnotes
-
-    def tm_footnotes_toggle(id)
-      "s = document.getElementById('#{id}').style; if(s.display == 'none') { s.display = '' } else { s.display = 'none' }"
-    end
-
-    footnotes_html = <<-HTML
-    <!-- TextMate Footnotes -->
-    <div style="clear:both"></div>
-    <div id="tm_footnotes_debug">
-      #{textmate_links}
-      Show:
-      <a href="#" onclick="#{tm_footnotes_toggle('session_debug_info')};return false">Session</a> |
-      <a href="#" onclick="#{tm_footnotes_toggle('cookies_debug_info')};return false">Cookies</a> |
-      <a href="#" onclick="#{tm_footnotes_toggle('params_debug_info')};return false">Params</a> |
-      <a href="#" onclick="#{tm_footnotes_toggle('log_debug_info')};return false">Log</a> |
-      <a href="#" onclick="#{tm_footnotes_toggle('general_debug_info')};return false">General Debug</a>
-      <br/>(<a href="http://blog.inquirylabs.com/2006/09/28/textmate-footnotes-v16-released/"><b>TextMate Footnotes</b></a>)
-      #{@extra_html}
-      <fieldset id="session_debug_info" class="tm_footnotes_debug_info" style="display: none">
-        <legend>Session</legend>
-        #{escape(@controller.session.instance_variable_get("@data").inspect)}
-      </fieldset>
-      <fieldset id="cookies_debug_info" class="tm_footnotes_debug_info" style="display: none">
-        <legend>Cookies</legend>
-        <code>#{escape(@controller.send(:cookies).inspect)}</code>
-      </fieldset>
-      <fieldset id="params_debug_info" class="tm_footnotes_debug_info" style="display: none">
-        <legend>Params</legend>
-        <code>#{escape(@controller.params.inspect)}</code>
-      </fieldset>
-      <fieldset id="log_debug_info" class="tm_footnotes_debug_info" style="display: none">
-        <legend>Log</legend>
-        <code><pre>#{escape(log_tail)}</pre></code>
-      </fieldset>
-      <fieldset id="general_debug_info" class="tm_footnotes_debug_info" style="display: none">
-        <legend>General (id="tm_debug")</legend>
-        <div id="tm_debug"></div>
-      </fieldset>
-    </div>
-    <!-- End TextMate Footnotes -->
-    HTML
-    if @body =~ %r{<div[^>]+id=['"]tm_footnotes['"][^>]*>}
-      # Insert inside the "tm_footnotes" div if it exists
-      insert_text :after, %r{<div[^>]+id=['"]tm_footnotes['"][^>]*>}, footnotes_html
-    else
-      # Otherwise, try to insert as the last part of the html body
-      insert_text :before, /<\/body>/i, footnotes_html
-    end
-  end
-
-  def textmate_links
-    html = ""
-    if ::MAC_OS_X
-      html = <<-HTML
-        Edit:
-        <a href="#{controller_url}">Controller</a> |
-        <a href="#{view_url}">View</a> |
-        <a href="#{layout_url}">Layout</a>
-      HTML
-      html += asset_file_links("Stylesheets", stylesheet_files) unless stylesheet_files.blank?
-      html += asset_file_links("Javascripts", javascript_files) unless javascript_files.blank?
-      html += "<br/>"
-    end
-    html
-  end
-
-  def log_tail
-    ansi = `tail -n 200 #{RAILS_DEFAULT_LOGGER.instance_variable_get("@logdev").filename}`
-    html = ansi.gsub(/\e\[.+?m/, '')
-  end
-
-  def asset_file_links(link_text, files)
-    return '' if files.size == 0
-    links = files.map do |filename|
-      if filename =~ %r{^/}
-        full_filename = File.join(abs_root, "public", filename)
-        %{<a href="#{textmate_prefix}#{full_filename}">#{filename}</a>}
-      else
-        %{<a href="#{filename}">#{filename}</a>}
-      end
-    end
-    @extra_html << <<-HTML
-      <fieldset id="tm_footnotes_#{link_text.underscore.gsub(' ', '_')}" class="tm_footnotes_debug_info" style="display: none">
-        <legend>#{link_text}</legend>
-        <ul><li>#{links.join("</li><li>")}</li></ul>
-      </fieldset>
-    HTML
-    # Return the link that will open the 'extra html' div
-    %{ | <a href="#" onclick="#{tm_footnotes_toggle('tm_footnotes_' + link_text.underscore.gsub(' ', '_') )}; return false">#{link_text}</a>}
-  end
-
-  def indent(indentation, text)
-    lines = text.to_a
-    initial_indentation = lines.first.scan(/^(\s+)/).flatten.first
-    lines.map do |line|
-      if initial_indentation.nil?
-        " " * indentation + line
-      elsif line.index(initial_indentation) == 0
-        " " * indentation + line[initial_indentation.size..-1]
-      else
-        " " * indentation + line
-      end
-    end.join
-  end
-
-  # Inserts text in to the body of the document
-  # +pattern+ is a Regular expression which, when matched, will cause +new_text+
-  # to be inserted before or after the match.  If no match is found, +new_text+ is appended
-  # to the body instead. +position+ may be either :before or :after
-  def insert_text(position, pattern, new_text, indentation = 4)
-    index = case pattern
-      when Regexp
-        if match = @body.match(pattern)
-          match.offset(0)[position == :before ? 0 : 1]
-        else
-          @body.size
-        end
-      else
-        pattern
-      end
-    @body.insert index, indent(indentation, new_text)
-  end
-
-  def escape(text)
-    text.gsub("&", "&amp;").gsub("<", "&lt;").gsub(">", "&gt;")
-  end
-end
\ No newline at end of file
diff --git a/bundles/ruby-on-rails.tmbundle/Support/plugins/footnotes/lib/textmate_initialize.rb b/bundles/ruby-on-rails.tmbundle/Support/plugins/footnotes/lib/textmate_initialize.rb
deleted file mode 100644
index 159d01a08..000000000
--- a/bundles/ruby-on-rails.tmbundle/Support/plugins/footnotes/lib/textmate_initialize.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-class ActionController::Base
-  attr_accessor :render_without_footnotes
-
-  after_filter FootnoteFilter
-
-protected
-  alias footnotes_original_render render
-  def render(options = nil, deprecated_status = nil, &block) #:doc:
-    if options.is_a? Hash
-      @render_without_footnotes = (options.delete(:footnotes) == false)
-    end
-    footnotes_original_render(options, deprecated_status, &block)
-  end
-end
diff --git a/bundles/ruby-on-rails.tmbundle/Support/plugins/footnotes/templates/rescues/template_error.rhtml b/bundles/ruby-on-rails.tmbundle/Support/plugins/footnotes/templates/rescues/template_error.rhtml
deleted file mode 100644
index 1372fd09c..000000000
--- a/bundles/ruby-on-rails.tmbundle/Support/plugins/footnotes/templates/rescues/template_error.rhtml
+++ /dev/null
@@ -1,21 +0,0 @@
-<h1>
-  <%=h @exception.original_exception.class.to_s %> in
-  <%=h @request.parameters["controller"].capitalize if @request.parameters["controller"]%>#<%=h @request.parameters["action"] %>
-</h1>
-
-<p>
-  Showing <i><%=h @exception.file_name %></i> where line <b>#<%= @exception.line_number_link rescue @exception.line_number %></b> raised:
-  <pre><code><%=h @exception.message %></code></pre>
-</p>
-
-<p>Extracted source (around line <b>#<%= @exception.line_number_link rescue @exception.line_number %></b>):
-<pre><code><%=h @exception.source_extract %></code></pre></p>
-
-<p><%=h @exception.sub_template_message %></p>
-
-<% @real_exception = @exception
-   @exception = @exception.original_exception || @exception %>
-<%= render_file(@rescues_path + "/_trace.rhtml", false) %>
-<% @exception = @real_exception %>
-
-<%= render_file(@rescues_path + "/_request_and_response.rhtml", false) %>
diff --git a/bundles/ruby-on-rails.tmbundle/Support/plugins/footnotes/test/mock_controller.rb b/bundles/ruby-on-rails.tmbundle/Support/plugins/footnotes/test/mock_controller.rb
deleted file mode 100644
index 813a2aaf1..000000000
--- a/bundles/ruby-on-rails.tmbundle/Support/plugins/footnotes/test/mock_controller.rb
+++ /dev/null
@@ -1,65 +0,0 @@
-require 'ostruct'
-
-RAILS_ROOT.replace File.dirname(__FILE__)
-::MAC_OS_X = (`uname`.chomp == "Darwin") rescue false
-
-class MockController
-  attr_accessor :template, :session, :params, :cookies
-
-  def initialize(body = "")
-    @body = body
-    @performed_render = true
-    @params = {:controller => 'test', :action => 'example'}
-    @session = {}
-    @cookies = {}
-    template
-  end
-
-  def template
-    @template ||= MockTemplate.new(self)
-  end
-
-  def response
-    @response ||= OpenStruct.new(:body => @body, :headers => {})
-  end
-
-  def first_render
-    @body
-  end
-
-  def request
-    @request ||= MockRequest.new(false)
-  end
-
-  def action_name
-    @params[:action]
-  end
-end
-
-class MockTemplate
-  def initialize(controller)
-    @controller = controller
-  end
-
-  def first_render
-    "example.rhtml"
-  end
-end
-
-class MockRequest < OpenStruct.new(:xhr)
-  alias_method :xhr?, :xhr
-end
-
-class FootnoteFilter
-  def controller_filename
-    __FILE__
-  end
-
-  def template_file_name
-    __FILE__
-  end
-
-  def layout_file_name
-    __FILE__
-  end
-end
\ No newline at end of file
diff --git a/bundles/ruby-on-rails.tmbundle/Support/plugins/footnotes/test/textmate_footnotes_test.rb b/bundles/ruby-on-rails.tmbundle/Support/plugins/footnotes/test/textmate_footnotes_test.rb
deleted file mode 100644
index 467408b1f..000000000
--- a/bundles/ruby-on-rails.tmbundle/Support/plugins/footnotes/test/textmate_footnotes_test.rb
+++ /dev/null
@@ -1,85 +0,0 @@
-require 'test/unit'
-require File.dirname(__FILE__) + '/../../../../config/environment'
-
-require File.dirname(__FILE__) + '/../lib/textmate_footnotes'
-require File.dirname(__FILE__) + '/mock_controller'
-
-$html = DATA.read
-
-class TextmateFootnotesTest < Test::Unit::TestCase
-  def setup
-    @controller = MockController.new $html.dup
-    @footnote = FootnoteFilter.new(@controller)
-  end
-
-  def test_mock_controller
-    index = @controller.response.body.index(/This is the HTML page/)
-    assert_equal 334, index
-  end
-
-  def test_footnote_not_included_when_request_is_xhr
-    @controller.request.xhr = true
-    @footnote.add_footnotes!
-    assert_equal $html, @controller.response.body
-  end
-
-  def test_footnote_not_included_when_content_type_is_javascript
-    @controller.response.headers['Content-Type'] = 'text/javascript'
-    @footnote.add_footnotes!
-    assert_equal $html, @controller.response.body
-  end
-
-  def test_footnote_included_when_content_type_is_html
-    @controller.response.headers['Content-Type'] = 'text/html'
-    @footnote.add_footnotes!
-    assert_not_equal $html, @controller.response.body
-  end
-
-  def test_footnote_included_when_content_type_is_nil
-    @footnote.add_footnotes!
-    assert_not_equal $html, @controller.response.body
-  end
-
-  def test_indent
-    before = "text\n  one\n  two"
-    after  = "  text\n    one\n    two"
-
-    assert_equal after, @footnote.indent(2, before)
-
-    before = " text\n  one\n  two"
-    after  = "  text\n   one\n   two"
-
-    assert_equal after, @footnote.indent(2, before)
-
-    before = "  text\none\ntwo"
-    after  = "  text\n  one\n  two"
-
-    assert_equal after, @footnote.indent(2, before)
-  end
-
-  def test_insert_text
-    @footnote.insert_text :after, /<head>/, "Graffiti", 0
-    after = "    <head>Graffiti\n"
-    assert_equal after, @footnote.body.to_a[2]
-
-    @footnote.insert_text :before, /<\/body>/, "Notes", 0
-    after = "    Notes</body>\n"
-    assert_equal after, @footnote.body.to_a[12]
-  end
-end
-
-__END__
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-    <head>
-        <title>HTML to XHTML Example: HTML page</title>
-        <link rel="Stylesheet" href="htmltohxhtml.css" type="text/css" media="screen">
-        <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
-    </head>
-    <body>
-        <p>This is the HTML page. It works and is encoded just like any HTML page you
-         have previously done. View <a href="htmltoxhtml2.htm">the XHTML version</a> of
-         this page to view the difference between HTML and XHTML.</p>
-        <p>You will be glad to know that no changes need to be made to any of your CSS files.</p>
-    </body>
-</html>
\ No newline at end of file
diff --git a/bundles/ruby-on-rails.tmbundle/Support/templates/list_plugins.rhtml b/bundles/ruby-on-rails.tmbundle/Support/templates/list_plugins.rhtml
deleted file mode 100644
index f7915e6ed..000000000
--- a/bundles/ruby-on-rails.tmbundle/Support/templates/list_plugins.rhtml
+++ /dev/null
@@ -1,267 +0,0 @@
-<html>
-	<head>
-		<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
-		<style type="text/css">
-			/* <![CDATA[ */
-			html, body {
-				width: 100%;
-				height: 100%;
-				margin: 0px;
-				padding: 0px;
-				font: 12px 'Lucida Grande';
-			}
-			#container-page {
-				height: auto;
-				top: 0; left: 0;
-			}
-			#container-content {
-				position: relative;
-				min-height: 100%;
-				width: 100%;
-				margin: 0px auto;
-			}
-			#container-footer {
-				text-align: center;
-				position: relative;
-				border-top: 2px solid #ccc;
-				padding-top: 1em;
-				margin: -4em auto 0 auto;
-				width: 100%;
-			}
-			#search-area {
-				text-align: center;
-				border-bottom: 2px solid #ccc;
-				padding: 0.5em 1em 0.4em 1em;
-				min-width: 480px;
-			}
-			#search-area h1 {
-				font-size: 16pt;
-				float: left;
-				margin: 0px 45px 5px 15px;
-				padding-bottom: 0.5em;
-			}
-			#search-area form {
-				float: left;
-				padding-top: 2px;
-			}
-			#search-panel {
-				float: left;
-				padding: 1.2em auto;
-			}
-			#output-area {
-				padding-bottom: 5em;
-			}
-			#rails-image {
-				float: left;
-			}
-			table.plugins {
-				width: 90%;
-			}
-			table.plugins td.home, table.plugins td.svn, table.plugins td.install {
-				width: 50px;
-			}
-			a {
-				color: #666;
-			}
-			.success {
-				border: 2px solid #99ff66; background-color: #eeffdd;
-				padding: 0.8em;
-				margin: 0.5em;
-			}
-			.failure {
-				border: 2px solid #ff9966; background-color: #ffeedd;
-				padding: 0.8em;
-				margin: 0.5em;
-			}
-			.loading {
-				border: 2px solid #9999ff; background-color: #eeeeff;
-				padding: 0.8em;
-				margin: 0.5em;
-			}
-			/* ]]> */
-		</style>
-		<script src="file://<%= File.join(TextMate.bundle_support, "javascripts", "prototype.js") %>" type="text/javascript" charset="utf-8"></script>
-		<title>Install a Plugin</title>
-	</head>
-	<body>
-		<div id="container-page">
-			<div id="container-content">
-				<div id="search-area">
-					<img src="file://<%= File.join(TextMate.bundle_support, 'images') %>/rails.png" width="43" height="56" id="rails-image">
-					<div id="search-panel">
-						<h1>Plugin Search</h1>
-						<form id="search-form" onsubmit="Plugin.search(this.search.value); return false;">
-							<input type="text" name="search" id="search" />
-							<input type="submit" value="Go" />
-						</form>
-					</div>
-					<div style="clear:both"></div>
-				</div>
-				<div id="output-area"></div>
-			</div>
-			<div id="container-footer">
-				Install the TextMate Footnotes Plugin
-			</div>
-		</div>
-	</body>
-	<script type="text/javascript" charset="utf-8">
-		function escapeEntities(text) {
-			return text.replace(/</m, "&lt;").replace(/>/m, "&gt;").replace(/&/m, "&amp;");
-		}
-
-		Plugin = Class.create();
-
-		// Class settings
-		Plugin.curlCommand = "curl -s -L -H 'Accept: application/xml'";
-		Plugin.directoryURL = "http://agilewebdevelopment.com/plugins/search";
-		Plugin.errorOutput = 'output-area';
-		Plugin.statusOutput = 'output-area';
-
-		// Class methods
-		Plugin.Methods = {
-			clearStatus: function() {
-				$(Plugin.statusOutput).innerHTML = "";
-			},
-
-			printStatus: function(message, className) {
-				if (!className) className = "success";
-				var html = "<div class=\"" + className + "\">" + message + "</div>";
-				$(Plugin.statusOutput).innerHTML += html;
-			},
-
-			printError: function(message) {
-				var html = "<div class=\"failure\">";
-				html += message;
-				html += "</div>";
-				$(Plugin.errorOutput).innerHTML = html;
-			},
-
-			getXML: function(searchTerm) {
-				var url = Plugin.directoryURL;
-				if (searchTerm) url += "?search=" + escape(searchTerm);
-
-				var command = Plugin.curlCommand + " " + url;
-				var response = TextMate.system(command, null);
-
-				if (response.errorString) {
-					var message = "<h2>Error retrieving XML from " + Plugin.directoryURL + "</h2>";
-					message += "<code><pre>" + escapeEntities(response.errorString) + "</pre></code>";
-					Plugin.printError(message);
-					return null;
-				}
-
-				return (new DOMParser().parseFromString(response.outputString, 'text/xml'));
-			},
-
-			search: function(searchTerm) {
-				var pluginNodes = Plugin.getXML(searchTerm).getElementsByTagName('plugin');
-				var plugins = $A();
-				for (var i = 0; i < pluginNodes.length; i++) {
-					var plugin = new Plugin(pluginNodes[i]);
-					plugins.push(plugin);
-				}
-				var table = Plugin.toTable(plugins);
-				$(Plugin.statusOutput).innerHTML = "";
-				$(Plugin.statusOutput).appendChild(table);
-				return false;
-			},
-
-			install: function(url) {
-				var output = document.getElementById('output');
-				var command = "cd <%= (e_sh root).gsub(/(?=\\)/, '\\') %>; ruby script/plugin install " + url;
-				Plugin.clearStatus();
-				Plugin.printStatus(command + "<br>Installing...", "loading");
-
-				var response = TextMate.system(command, null);
-				if (response.errorString) {
-					Plugin.printError(response.errorString);
-				} else {
-					Plugin.printStatus("<code><pre>" + escapeEntities(response.outputString) + "</pre></code>");
-				}
-			},
-
-			toTable: function(plugins) {
-				var table = document.createElement('table');
-				table.align = "center";
-				table.className = "plugins";
-				for (var i = 0; i < plugins.length; i++) {
-					table.appendChild(plugins[i].toRow());
-				}
-				return table;
-			}
-		};
-
-		Object.extend(Plugin, Plugin.Methods);
-
-		Plugin.prototype = {
-			initialize: function(xmlNode) {
-				this.name						= this.getValue(xmlNode, 'name');
-				this.rating					= this.getValue(xmlNode, 'rating');
-				this.license				= this.getValue(xmlNode, 'license');
-
-				this.homeURL				= this.getValue(xmlNode, 'home');
-				this.repositoryURL	= this.getValue(xmlNode, 'repository');
-				this.summaryURL			= this.getValue(xmlNode, 'link');
-			},
-
-			getValue: function (xmlNode, key, defaultValue) {
-				try {
-					return xmlNode.getElementsByTagName(key)[0].firstChild.nodeValue;
-				} catch(e) {
-					return (defaultValue || null);
-				}
-			},
-
-			toRow: function() {
-				var row = document.createElement("tr");
-
-				var cell = document.createElement("td");
-				cell.className = "name"
-				cell.appendChild(this.createLink({text: this.name, href: this.summaryURL}));
-				row.appendChild(cell);
-
-				cell = document.createElement("td");
-				cell.className = "home";
-				if (this.homeURL && this.homeURL != "")
-					cell.appendChild(this.createLink({image: "home.gif", href: this.homeURL}));
-				row.appendChild(cell);
-
-				cell = document.createElement("td");
-				cell.className = "svn";
-				if (this.repositoryURL && this.repositoryURL != "")
-					cell.appendChild(this.createLink({image: "svn.png", href: this.repositoryURL}));
-				row.appendChild(cell);
-
-				cell = document.createElement("td");
-				cell.className = "install";
-				<% if enable_install %>
-				if (this.repositoryURL && this.repositoryURL != "") {
-					var link = this.createLink({
-						image: "install.gif",
-						href: "#",
-						onclick: function() { Plugin.install(this.repositoryURL); }.bind(this)
-					});
-					cell.appendChild(link);
-				}
-				<% end %>
-				row.appendChild(cell);
-
-				return row;
-			},
-
-			createLink: function(options) {
-				var link = document.createElement('a');
-				link.href = options["href"];
-				link.onclick = options["onclick"];
-				if (options["text"]) {
-					link.appendChild(document.createTextNode(options["text"]));
-				} else if (options["image"]) {
-					var img = document.createElement("img");
-					img.src = "file://<%= File.join(TextMate.bundle_support, 'images') %>/" + options["image"];
-					link.appendChild(img);
-				}
-				return link;
-			}
-		}
-	</script>
-</html>
\ No newline at end of file
diff --git a/bundles/ruby-on-rails.tmbundle/Support/test/app_fixtures/app/controllers/admin/base_controller.rb b/bundles/ruby-on-rails.tmbundle/Support/test/app_fixtures/app/controllers/admin/base_controller.rb
deleted file mode 100644
index 1737b31d2..000000000
--- a/bundles/ruby-on-rails.tmbundle/Support/test/app_fixtures/app/controllers/admin/base_controller.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-class Admin::BaseController < ApplicationController
-  def edit
-    @user = User.new(params[:user])
-  end
-
-  def update
-    @user = User.new(params[:user])
-  end
-end
\ No newline at end of file
diff --git a/bundles/ruby-on-rails.tmbundle/Support/test/app_fixtures/app/controllers/posts_controller.rb b/bundles/ruby-on-rails.tmbundle/Support/test/app_fixtures/app/controllers/posts_controller.rb
deleted file mode 100644
index 0ad983a82..000000000
--- a/bundles/ruby-on-rails.tmbundle/Support/test/app_fixtures/app/controllers/posts_controller.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-class PostsController < ApplicationController
-  def new
-    @post = Post.new
-  end
-
-  def create
-    @post = Post.new(params[:post])
-  end
-
-  def index
-    respond_to do |wants|
-      wants.html  { }
-      wants.xml   { }
-      wants.js    { }
-      wants.wacky { }
-    end
-    respond_to do |format|
-      format.html { }
-    end
-  end
-
-  def edit
-  end
-end
\ No newline at end of file
diff --git a/bundles/ruby-on-rails.tmbundle/Support/test/app_fixtures/app/controllers/user_controller.rb b/bundles/ruby-on-rails.tmbundle/Support/test/app_fixtures/app/controllers/user_controller.rb
deleted file mode 100644
index 62e416e19..000000000
--- a/bundles/ruby-on-rails.tmbundle/Support/test/app_fixtures/app/controllers/user_controller.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-class UserController < ApplicationController
-  def new
-    @user = User.new
-  end
-
-  def create
-    @user = User.new(params[:user])
-  end
-end
\ No newline at end of file
diff --git a/bundles/ruby-on-rails.tmbundle/Support/test/app_fixtures/app/controllers/users_controller.rb b/bundles/ruby-on-rails.tmbundle/Support/test/app_fixtures/app/controllers/users_controller.rb
deleted file mode 100644
index e382ffd1d..000000000
--- a/bundles/ruby-on-rails.tmbundle/Support/test/app_fixtures/app/controllers/users_controller.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-class UsersController < ApplicationController
-  def new
-    @user = User.new
-  end
-
-  def create
-    @user = User.new(params[:user])
-  end
-  
-  def no_existing_views
-    respond_to do |wants|
-      wants.html {  } # format with an inline block
-      wants.js do
-        # format with a multi-line block
-      end
-      wants.xml # format without a block
-      wants.wacky # non-standard format
-    end
-  end
-
-  def existing_views
-    respond_to do |wants|
-      wants.html {  } # format with an inline block
-      wants.js do
-        # format with a multi-line block
-      end
-      wants.xml # format without a block
-      wants.wacky # non-standard format
-    end
-  end
-end
\ No newline at end of file
diff --git a/bundles/ruby-on-rails.tmbundle/Support/test/app_fixtures/app/helpers/user_helper.rb b/bundles/ruby-on-rails.tmbundle/Support/test/app_fixtures/app/helpers/user_helper.rb
deleted file mode 100644
index e3ac4a23e..000000000
--- a/bundles/ruby-on-rails.tmbundle/Support/test/app_fixtures/app/helpers/user_helper.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-module UserHelper
-end
\ No newline at end of file
diff --git a/bundles/ruby-on-rails.tmbundle/Support/test/app_fixtures/app/models/notifier.rb b/bundles/ruby-on-rails.tmbundle/Support/test/app_fixtures/app/models/notifier.rb
deleted file mode 100644
index 35c3c2061..000000000
--- a/bundles/ruby-on-rails.tmbundle/Support/test/app_fixtures/app/models/notifier.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-class Notifier < ActionMailer::Base
-  def forgot_password(user, url)
-    # Email header info
-    @subject += "Forgotten password notification"
-  end
-end
diff --git a/bundles/ruby-on-rails.tmbundle/Support/test/app_fixtures/app/models/person.rb b/bundles/ruby-on-rails.tmbundle/Support/test/app_fixtures/app/models/person.rb
deleted file mode 100644
index e64a82621..000000000
--- a/bundles/ruby-on-rails.tmbundle/Support/test/app_fixtures/app/models/person.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-class Person < ActiveRecord::Base
-end
\ No newline at end of file
diff --git a/bundles/ruby-on-rails.tmbundle/Support/test/app_fixtures/app/models/user.rb b/bundles/ruby-on-rails.tmbundle/Support/test/app_fixtures/app/models/user.rb
deleted file mode 100644
index 431cf7baf..000000000
--- a/bundles/ruby-on-rails.tmbundle/Support/test/app_fixtures/app/models/user.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-class User < ActiveRecord::Base
-end
\ No newline at end of file
diff --git a/bundles/ruby-on-rails.tmbundle/Support/test/app_fixtures/app/views/admin/base/action.html.erb b/bundles/ruby-on-rails.tmbundle/Support/test/app_fixtures/app/views/admin/base/action.html.erb
deleted file mode 100644
index e69de29bb..000000000
diff --git a/bundles/ruby-on-rails.tmbundle/Support/test/app_fixtures/app/views/notifier/forgot_password.html.erb b/bundles/ruby-on-rails.tmbundle/Support/test/app_fixtures/app/views/notifier/forgot_password.html.erb
deleted file mode 100644
index 477e4f334..000000000
--- a/bundles/ruby-on-rails.tmbundle/Support/test/app_fixtures/app/views/notifier/forgot_password.html.erb
+++ /dev/null
@@ -1,15 +0,0 @@
-Dear <%= @name %>,
-
-<p>So you forgot your password to the family Website?  No problem!  Here's what we need to do in that case:</p>
-
-<ol>
-  <li>Request this email (DONE!)</li>
-  <li><a href="<%= @url %>">Click on this link to reset your password</a></li>
-  <li>And you'll get a new password!</li>
-</ol>
-
-<p>NOTE: You'll also need your sign-in name, which is '<%= @login %>'.</p>
-
-<p>Remember that you can always change your password after you sign in by visiting your account information.</p>
-
-<%= @url %>
\ No newline at end of file
diff --git a/bundles/ruby-on-rails.tmbundle/Support/test/app_fixtures/app/views/user/new.rhtml b/bundles/ruby-on-rails.tmbundle/Support/test/app_fixtures/app/views/user/new.rhtml
deleted file mode 100644
index e69de29bb..000000000
diff --git a/bundles/ruby-on-rails.tmbundle/Support/test/app_fixtures/app/views/users/create.html.erb b/bundles/ruby-on-rails.tmbundle/Support/test/app_fixtures/app/views/users/create.html.erb
deleted file mode 100644
index e69de29bb..000000000
diff --git a/bundles/ruby-on-rails.tmbundle/Support/test/app_fixtures/app/views/users/existing_views.html.erb b/bundles/ruby-on-rails.tmbundle/Support/test/app_fixtures/app/views/users/existing_views.html.erb
deleted file mode 100644
index 1c538fb9f..000000000
--- a/bundles/ruby-on-rails.tmbundle/Support/test/app_fixtures/app/views/users/existing_views.html.erb
+++ /dev/null
@@ -1 +0,0 @@
-existing_views
\ No newline at end of file
diff --git a/bundles/ruby-on-rails.tmbundle/Support/test/app_fixtures/app/views/users/existing_views.js.rjs b/bundles/ruby-on-rails.tmbundle/Support/test/app_fixtures/app/views/users/existing_views.js.rjs
deleted file mode 100644
index 1c538fb9f..000000000
--- a/bundles/ruby-on-rails.tmbundle/Support/test/app_fixtures/app/views/users/existing_views.js.rjs
+++ /dev/null
@@ -1 +0,0 @@
-existing_views
\ No newline at end of file
diff --git a/bundles/ruby-on-rails.tmbundle/Support/test/app_fixtures/app/views/users/existing_views.wacky.erb b/bundles/ruby-on-rails.tmbundle/Support/test/app_fixtures/app/views/users/existing_views.wacky.erb
deleted file mode 100644
index 1c538fb9f..000000000
--- a/bundles/ruby-on-rails.tmbundle/Support/test/app_fixtures/app/views/users/existing_views.wacky.erb
+++ /dev/null
@@ -1 +0,0 @@
-existing_views
\ No newline at end of file
diff --git a/bundles/ruby-on-rails.tmbundle/Support/test/app_fixtures/app/views/users/existing_views.xml.builder b/bundles/ruby-on-rails.tmbundle/Support/test/app_fixtures/app/views/users/existing_views.xml.builder
deleted file mode 100644
index 1c538fb9f..000000000
--- a/bundles/ruby-on-rails.tmbundle/Support/test/app_fixtures/app/views/users/existing_views.xml.builder
+++ /dev/null
@@ -1 +0,0 @@
-existing_views
\ No newline at end of file
diff --git a/bundles/ruby-on-rails.tmbundle/Support/test/app_fixtures/app/views/users/new.html.erb b/bundles/ruby-on-rails.tmbundle/Support/test/app_fixtures/app/views/users/new.html.erb
deleted file mode 100644
index e69de29bb..000000000
diff --git a/bundles/ruby-on-rails.tmbundle/Support/test/app_fixtures/config/boot.rb b/bundles/ruby-on-rails.tmbundle/Support/test/app_fixtures/config/boot.rb
deleted file mode 100644
index 5697cc1bc..000000000
--- a/bundles/ruby-on-rails.tmbundle/Support/test/app_fixtures/config/boot.rb
+++ /dev/null
@@ -1,109 +0,0 @@
-# Don't change this file!
-# Configure your app in config/environment.rb and config/environments/*.rb
-
-RAILS_ROOT = "#{File.dirname(__FILE__)}/.." unless defined?(RAILS_ROOT)
-
-module Rails
-  class << self
-    def boot!
-      unless booted?
-        preinitialize
-        pick_boot.run
-      end
-    end
-
-    def booted?
-      defined? Rails::Initializer
-    end
-
-    def pick_boot
-      (vendor_rails? ? VendorBoot : GemBoot).new
-    end
-
-    def vendor_rails?
-      File.exist?("#{RAILS_ROOT}/vendor/rails")
-    end
-
-    # FIXME : Ruby 1.9
-    def preinitialize
-      load(preinitializer_path) if File.exists?(preinitializer_path)
-    end
-
-    def preinitializer_path
-      "#{RAILS_ROOT}/config/preinitializer.rb"
-    end
-  end
-
-  class Boot
-    def run
-      load_initializer
-      Rails::Initializer.run(:set_load_path)
-    end
-  end
-
-  class VendorBoot < Boot
-    def load_initializer
-      require "#{RAILS_ROOT}/vendor/rails/railties/lib/initializer"
-    end
-  end
-
-  class GemBoot < Boot
-    def load_initializer
-      self.class.load_rubygems
-      load_rails_gem
-      require 'initializer'
-    end
-
-    def load_rails_gem
-      if version = self.class.gem_version
-        gem 'rails', version
-      else
-        gem 'rails'
-      end
-    rescue Gem::LoadError => load_error
-      $stderr.puts %(Missing the Rails #{version} gem. Please `gem install -v=#{version} rails`, update your RAILS_GEM_VERSION setting in config/environment.rb for the Rails version you do have installed, or comment out RAILS_GEM_VERSION to use the latest version installed.)
-      exit 1
-    end
-
-    class << self
-      def rubygems_version
-        Gem::RubyGemsVersion if defined? Gem::RubyGemsVersion
-      end
-
-      def gem_version
-        if defined? RAILS_GEM_VERSION
-          RAILS_GEM_VERSION
-        elsif ENV.include?('RAILS_GEM_VERSION')
-          ENV['RAILS_GEM_VERSION']
-        else
-          parse_gem_version(read_environment_rb)
-        end
-      end
-
-      def load_rubygems
-        require 'rubygems'
-
-        unless rubygems_version >= '0.9.4'
-          $stderr.puts %(Rails requires RubyGems >= 0.9.4 (you have #{rubygems_version}). Please `gem update --system` and try again.)
-          exit 1
-        end
-
-      rescue LoadError
-        $stderr.puts %(Rails requires RubyGems >= 0.9.4. Please install RubyGems and try again: http://rubygems.rubyforge.org)
-        exit 1
-      end
-
-      def parse_gem_version(text)
-        $1 if text =~ /^[^#]*RAILS_GEM_VERSION\s*=\s*["']([!~<>=]*\s*[\d.]+)["']/
-      end
-
-      private
-        def read_environment_rb
-          File.read("#{RAILS_ROOT}/config/environment.rb")
-        end
-    end
-  end
-end
-
-# All that for this:
-Rails.boot!
diff --git a/bundles/ruby-on-rails.tmbundle/Support/test/app_fixtures/config/environment.rb b/bundles/ruby-on-rails.tmbundle/Support/test/app_fixtures/config/environment.rb
deleted file mode 100644
index 5697cc1bc..000000000
--- a/bundles/ruby-on-rails.tmbundle/Support/test/app_fixtures/config/environment.rb
+++ /dev/null
@@ -1,109 +0,0 @@
-# Don't change this file!
-# Configure your app in config/environment.rb and config/environments/*.rb
-
-RAILS_ROOT = "#{File.dirname(__FILE__)}/.." unless defined?(RAILS_ROOT)
-
-module Rails
-  class << self
-    def boot!
-      unless booted?
-        preinitialize
-        pick_boot.run
-      end
-    end
-
-    def booted?
-      defined? Rails::Initializer
-    end
-
-    def pick_boot
-      (vendor_rails? ? VendorBoot : GemBoot).new
-    end
-
-    def vendor_rails?
-      File.exist?("#{RAILS_ROOT}/vendor/rails")
-    end
-
-    # FIXME : Ruby 1.9
-    def preinitialize
-      load(preinitializer_path) if File.exists?(preinitializer_path)
-    end
-
-    def preinitializer_path
-      "#{RAILS_ROOT}/config/preinitializer.rb"
-    end
-  end
-
-  class Boot
-    def run
-      load_initializer
-      Rails::Initializer.run(:set_load_path)
-    end
-  end
-
-  class VendorBoot < Boot
-    def load_initializer
-      require "#{RAILS_ROOT}/vendor/rails/railties/lib/initializer"
-    end
-  end
-
-  class GemBoot < Boot
-    def load_initializer
-      self.class.load_rubygems
-      load_rails_gem
-      require 'initializer'
-    end
-
-    def load_rails_gem
-      if version = self.class.gem_version
-        gem 'rails', version
-      else
-        gem 'rails'
-      end
-    rescue Gem::LoadError => load_error
-      $stderr.puts %(Missing the Rails #{version} gem. Please `gem install -v=#{version} rails`, update your RAILS_GEM_VERSION setting in config/environment.rb for the Rails version you do have installed, or comment out RAILS_GEM_VERSION to use the latest version installed.)
-      exit 1
-    end
-
-    class << self
-      def rubygems_version
-        Gem::RubyGemsVersion if defined? Gem::RubyGemsVersion
-      end
-
-      def gem_version
-        if defined? RAILS_GEM_VERSION
-          RAILS_GEM_VERSION
-        elsif ENV.include?('RAILS_GEM_VERSION')
-          ENV['RAILS_GEM_VERSION']
-        else
-          parse_gem_version(read_environment_rb)
-        end
-      end
-
-      def load_rubygems
-        require 'rubygems'
-
-        unless rubygems_version >= '0.9.4'
-          $stderr.puts %(Rails requires RubyGems >= 0.9.4 (you have #{rubygems_version}). Please `gem update --system` and try again.)
-          exit 1
-        end
-
-      rescue LoadError
-        $stderr.puts %(Rails requires RubyGems >= 0.9.4. Please install RubyGems and try again: http://rubygems.rubyforge.org)
-        exit 1
-      end
-
-      def parse_gem_version(text)
-        $1 if text =~ /^[^#]*RAILS_GEM_VERSION\s*=\s*["']([!~<>=]*\s*[\d.]+)["']/
-      end
-
-      private
-        def read_environment_rb
-          File.read("#{RAILS_ROOT}/config/environment.rb")
-        end
-    end
-  end
-end
-
-# All that for this:
-Rails.boot!
diff --git a/bundles/ruby-on-rails.tmbundle/Support/test/app_fixtures/script/generate b/bundles/ruby-on-rails.tmbundle/Support/test/app_fixtures/script/generate
deleted file mode 100755
index 173a9f147..000000000
--- a/bundles/ruby-on-rails.tmbundle/Support/test/app_fixtures/script/generate
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../config/boot'
-require 'commands/generate'
diff --git a/bundles/ruby-on-rails.tmbundle/Support/test/fixtures/app/controllers/posts_controller.rb b/bundles/ruby-on-rails.tmbundle/Support/test/fixtures/app/controllers/posts_controller.rb
deleted file mode 100644
index 0ad983a82..000000000
--- a/bundles/ruby-on-rails.tmbundle/Support/test/fixtures/app/controllers/posts_controller.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-class PostsController < ApplicationController
-  def new
-    @post = Post.new
-  end
-
-  def create
-    @post = Post.new(params[:post])
-  end
-
-  def index
-    respond_to do |wants|
-      wants.html  { }
-      wants.xml   { }
-      wants.js    { }
-      wants.wacky { }
-    end
-    respond_to do |format|
-      format.html { }
-    end
-  end
-
-  def edit
-  end
-end
\ No newline at end of file
diff --git a/bundles/ruby-on-rails.tmbundle/Support/test/fixtures/vendor/plugins/haml/init.rb b/bundles/ruby-on-rails.tmbundle/Support/test/fixtures/vendor/plugins/haml/init.rb
deleted file mode 100644
index e69de29bb..000000000
diff --git a/bundles/ruby-on-rails.tmbundle/Support/test/test_buffer.rb b/bundles/ruby-on-rails.tmbundle/Support/test/test_buffer.rb
deleted file mode 100644
index 99737f1e6..000000000
--- a/bundles/ruby-on-rails.tmbundle/Support/test/test_buffer.rb
+++ /dev/null
@@ -1,118 +0,0 @@
-require File.dirname(__FILE__) + '/test_helper'
-
-require 'text_mate_mock'
-require 'rails/buffer'
-
-TextMate.line_number = '1'
-TextMate.column_number = '1'
-TextMate.selected_text = <<-END
-def my_method
-  puts 'hi'
-  # some comment, 'hi'
-end
-
-def my_other_method
-  x = y + z
-  # another comment
-end
-
-def index
-  respond_to do |wants|
-    wants.html { }
-    wants.js   { }
-    wants.css  { }
-  end
-  respond_to { | wacky |
-    wacky.wackier { }
-  }
-end
-
-def edit
-end
-END
-
-class BufferTest < Test::Unit::TestCase
-  def test_find
-    b = Buffer.new(TextMate.selected_text)
-    match = b.find { /'(.+)'/ }
-    assert_equal [1, "hi"], match
-
-    match = b.find(:from => 2, :to => 1, :direction => :backward) { /'(.+)'/ }
-    assert_equal [2, "hi"], match
-
-    match = b.find(:from => 2, :to => 1, :direction => :backward) { /my_method/ }
-    assert_nil match
-  end
-
-  def test_find_method
-    b = Buffer.new(TextMate.selected_text)
-    assert_equal [0, 'my_method'], b.find_method
-
-    b.line_number = 4
-    assert_equal [0, 'my_method'], b.find_method
-
-    b.line_number = 5
-    assert_equal [5, 'my_other_method'], b.find_method
-  end
-
-  def test_find_respond_to_format
-     b = Buffer.new(TextMate.selected_text)
-     assert_equal nil, b.find_respond_to_format
-     b.line_number = 10
-     assert_equal nil, b.find_respond_to_format
-     b.line_number = 11
-     assert_equal [12, 'html'], b.find_respond_to_format
-     b.line_number = 12
-     assert_equal [12, 'html'], b.find_respond_to_format
-     b.line_number = 13
-     assert_equal [13, 'js'], b.find_respond_to_format
-     b.line_number = 14
-     assert_equal [14, 'css'], b.find_respond_to_format
-     b.line_number = 15
-     assert_equal [14, 'css'], b.find_respond_to_format
-     b.line_number = 16
-     assert_equal [17, 'wackier'], b.find_respond_to_format
-     b.line_number = 17
-     assert_equal [17, 'wackier'], b.find_respond_to_format
-     b.line_number = 18
-     assert_equal [17, 'wackier'], b.find_respond_to_format
-     b.line_number = 19
-     assert_equal [17, 'wackier'], b.find_respond_to_format
-     b.line_number = 20
-     assert_equal [17, 'wackier'], b.find_respond_to_format
-     b.line_number = 21
-     assert_equal nil, b.find_respond_to_format
-  end
-
-  def test_find_multiple_matches
-    b = Buffer.new(TextMate.selected_text)
-    match = b.find { /^\s*x = (\w) \+ (\w)\s*$/ }
-    assert_equal [6, 'y', 'z'], match
-
-    b = Buffer.new(TextMate.selected_text)
-    match = b.find { /^\s*x = (\w) \+ (\w)(\w?)\s*$/ }
-    assert_equal [6, 'y', 'z', ''], match
-  end
-
-  def test_find_nearest_string_or_symbol
-    b = Buffer.new "String :with => 'strings', :and, :symbols"
-    match = b.find_nearest_string_or_symbol
-    assert_equal ["with", 8], match
-
-    b.column_number = 8
-    match = b.find_nearest_string_or_symbol
-    assert_equal ["with", 8], match
-
-    b.column_number = 25
-    match = b.find_nearest_string_or_symbol
-    assert_equal ["strings", 17], match
-
-    b.column_number = 37
-    match = b.find_nearest_string_or_symbol
-    assert_equal ["symbols", 34], match
-
-    b = Buffer.new "String without symbols or strings"
-    match = b.find_nearest_string_or_symbol
-    assert_nil match
-  end
-end
\ No newline at end of file
diff --git a/bundles/ruby-on-rails.tmbundle/Support/test/test_generator.rb b/bundles/ruby-on-rails.tmbundle/Support/test/test_generator.rb
deleted file mode 100644
index 1c3e07cf4..000000000
--- a/bundles/ruby-on-rails.tmbundle/Support/test/test_generator.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-require File.dirname(__FILE__) + '/test_helper'
-require "rails/generate"
-
-class TestBinGenerate < Test::Unit::TestCase
-  def test_known_generators
-    expected = %w[scaffold controller model mailer migration plugin]
-    actual = Generator.known_generators.map { |gen| gen.name }
-    assert_equal(expected, actual)
-  end
-
-  def test_find_generator_names
-    list = Generator.find_generator_names
-    assert_equal(Array, list.class)
-    list.each do |name|
-      assert_equal(String, name.class)
-      assert_no_match(/[ \t\n]/, name, "generator names should not contain spaces")
-    end
-  end
-
-  def test_generators
-    generators = Generator.setup_generators
-    assert(generators.length > 6, "Failure message.")
-    assert_equal(Array, generators.class)
-    generators.each do |gen|
-      assert_equal(Generator, gen.class)
-      assert_no_match(/[ \t\n]/, gen.name, "generator names should not contain spaces")
-    end
-  end
-end
\ No newline at end of file
diff --git a/bundles/ruby-on-rails.tmbundle/Support/test/test_helper.rb b/bundles/ruby-on-rails.tmbundle/Support/test/test_helper.rb
deleted file mode 100644
index 121b37853..000000000
--- a/bundles/ruby-on-rails.tmbundle/Support/test/test_helper.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'test/unit'
-require "fileutils"
-$:.push File.dirname(__FILE__)
-$:.push File.dirname(__FILE__) + '/../lib'
-FIXTURE_PATH = File.expand_path(File.dirname(__FILE__) + '/app_fixtures')
-
-def ruby(command)
-  `/usr/bin/env ruby #{command}`
-end
diff --git a/bundles/ruby-on-rails.tmbundle/Support/test/test_rails_path.rb b/bundles/ruby-on-rails.tmbundle/Support/test/test_rails_path.rb
deleted file mode 100644
index a62b31082..000000000
--- a/bundles/ruby-on-rails.tmbundle/Support/test/test_rails_path.rb
+++ /dev/null
@@ -1,289 +0,0 @@
-require File.dirname(__FILE__) + '/test_helper'
-
-require 'text_mate_mock'
-require 'rails/rails_path'
-
-class RailsPathTest < Test::Unit::TestCase
-  def setup
-    TextMate.line_number = '1'
-    TextMate.column_number = '1'
-    TextMate.project_directory = File.expand_path(File.dirname(__FILE__) + '/app_fixtures')
-    @rp_controller = RailsPath.new(FIXTURE_PATH + '/app/controllers/user_controller.rb')
-    @rp_controller_with_module = RailsPath.new(FIXTURE_PATH + '/app/controllers/admin/base_controller.rb')
-    @rp_view = RailsPath.new(FIXTURE_PATH + '/app/views/user/new.rhtml')
-    @rp_view_with_module = RailsPath.new(FIXTURE_PATH + '/app/views/admin/base/action.rhtml')
-    @rp_fixture = RailsPath.new(FIXTURE_PATH + '/test/fixtures/users.yml')
-    @rp_fixture_spec = RailsPath.new(FIXTURE_PATH + '/spec/fixtures/users.yml')
-    @rp_wacky = RailsPath.new(FIXTURE_PATH + '/wacky/users.yml')
-  end
-
-  def test_rails_root
-    assert_equal File.expand_path(File.dirname(__FILE__) + '/app_fixtures'), RailsPath.new.rails_root
-  end
-
-  def test_extension
-    assert_equal "rb", @rp_controller.extension
-    assert_equal "rhtml", @rp_view.extension
-  end
-
-  def test_file_type
-    assert_equal :controller, @rp_controller.file_type
-    assert_equal :view, @rp_view.file_type
-    assert_equal :fixture, @rp_fixture.file_type
-    assert_equal :fixture, @rp_fixture_spec.file_type
-    assert_equal nil, @rp_wacky.file_type
-  end
-
-  def test_modules
-    assert_equal [], @rp_controller.modules
-    assert_equal ['admin'], @rp_controller_with_module.modules
-    assert_equal [], @rp_view.modules
-    assert_equal ['admin'], @rp_view_with_module.modules
-    assert_equal [], @rp_fixture.modules
-    assert_equal [], @rp_fixture_spec.modules
-    assert_equal nil, @rp_wacky.modules
-  end
-
-  def test_controller_name
-    rp = RailsPath.new(FIXTURE_PATH + '/app/models/person.rb')
-    assert_equal "people", rp.controller_name
-    rp = RailsPath.new(FIXTURE_PATH + '/app/models/user.rb')
-    assert_equal "user", rp.controller_name
-    rp = RailsPath.new(FIXTURE_PATH + '/app/models/users.rb')
-    assert_equal "users", rp.controller_name
-  end
-
-  def test_controller_name_and_action_name_for_controller
-    rp = RailsPath.new(FIXTURE_PATH + '/app/controllers/user_controller.rb')
-    assert_equal "user", rp.controller_name
-    assert_equal nil, rp.action_name
-
-    TextMate.line_number = '3'
-    rp = RailsPath.new(FIXTURE_PATH + '/app/controllers/user_controller.rb')
-    assert_equal "user", rp.controller_name
-    assert_equal "new", rp.action_name
-
-    TextMate.line_number = '6'
-    rp = RailsPath.new(FIXTURE_PATH + '/app/controllers/user_controller.rb')
-    assert_equal "user", rp.controller_name
-    assert_equal "create", rp.action_name
-  end
-
-  def test_controller_name_and_action_name_for_view
-    rp = RailsPath.new(FIXTURE_PATH + '/app/views/user/new.rhtml')
-    assert_equal "user", rp.controller_name # this was pre-2.0 behavior. s/b "users"
-    assert_equal "new", rp.action_name
-  end
-
-  # Rails 2.x convention is for pluralized controllers
-  def test_controller_name_and_action_name_for_2_dot_ooh_views
-    rp = RailsPath.new(FIXTURE_PATH + '/app/views/users/new.html.erb')
-    assert_equal "users", rp.controller_name
-    assert_equal "new", rp.action_name
-  end
-
-  def test_controller_name_pluralization
-    rp = RailsPath.new(FIXTURE_PATH + '/app/views/people/new.html.erb')
-    assert_equal "people", rp.controller_name
-  end
-
-  def test_controller_name_suggestion_when_controller_absent
-    rp = RailsPath.new(FIXTURE_PATH + '/app/views/people/new.html.erb')
-    assert_equal "people", rp.controller_name
-  end
-
-  def test_respond_to_format
-    current_file = RailsPath.new(FIXTURE_PATH + '/app/controllers/posts_controller.rb')
-    TextMate.line_number = '14'
-    assert_equal [13, 'js'], current_file.respond_to_format
-  end
-
-  def test_rails_path_for
-    partners = [
-      # Basic tests
-      [FIXTURE_PATH + '/app/controllers/user_controller.rb', :helper, FIXTURE_PATH + '/app/helpers/user_helper.rb'],
-      [FIXTURE_PATH + '/app/controllers/user_controller.rb', :javascript, FIXTURE_PATH + '/public/javascripts/user.js'],
-      [FIXTURE_PATH + '/app/controllers/user_controller.rb', :functional_test, FIXTURE_PATH + '/test/functional/user_controller_test.rb'],
-      [FIXTURE_PATH + '/app/helpers/user_helper.rb', :controller, FIXTURE_PATH + '/app/controllers/users_controller.rb'],
-      [FIXTURE_PATH + '/app/models/user.rb', :controller, FIXTURE_PATH + '/app/controllers/users_controller.rb'],
-      [FIXTURE_PATH + '/app/models/post.rb', :controller, FIXTURE_PATH + '/app/controllers/posts_controller.rb'],
-      [FIXTURE_PATH + '/test/fixtures/users.yml', :model, FIXTURE_PATH + '/app/models/user.rb'],
-      [FIXTURE_PATH + '/spec/fixtures/users.yml', :model, FIXTURE_PATH + '/app/models/user.rb'],
-      [FIXTURE_PATH + '/app/controllers/user_controller.rb', :model, FIXTURE_PATH + '/app/models/user.rb'],
-      [FIXTURE_PATH + '/test/fixtures/users.yml', :unit_test, FIXTURE_PATH + '/test/unit/user_test.rb'],
-      [FIXTURE_PATH + '/app/models/user.rb', :fixture, FIXTURE_PATH + '/test/fixtures/users.yml'],
-      # With modules
-      [FIXTURE_PATH + '/app/controllers/admin/base_controller.rb', :helper, FIXTURE_PATH + '/app/helpers/admin/base_helper.rb'],
-      [FIXTURE_PATH + '/app/controllers/admin/inside/outside_controller.rb', :javascript, FIXTURE_PATH + '/public/javascripts/admin/inside/outside.js'],
-      [FIXTURE_PATH + '/app/controllers/admin/base_controller.rb', :functional_test, FIXTURE_PATH + '/test/functional/admin/base_controller_test.rb'],
-      [FIXTURE_PATH + '/app/helpers/admin/base_helper.rb', :controller, FIXTURE_PATH + '/app/controllers/admin/base_controller.rb'],
-    ]
-    # TODO Add [posts.yml, :model, post.rb]
-    for pair in partners
-      assert_equal RailsPath.new(pair[2]), RailsPath.new(pair[0]).rails_path_for(pair[1])
-    end
-
-    # Test controller to view
-    ENV['RAILS_VIEW_EXT'] = nil
-    TextMate.line_number = '6'
-    current_file = RailsPath.new(FIXTURE_PATH + '/app/controllers/user_controller.rb')
-    assert_equal RailsPath.new(FIXTURE_PATH + '/app/views/user/create.html.erb'), current_file.rails_path_for(:view)
-
-    # 2.0 plural controllers
-    current_file = RailsPath.new(FIXTURE_PATH + '/app/controllers/users_controller.rb')
-    assert_equal RailsPath.new(FIXTURE_PATH + '/app/views/users/create.html.erb'), current_file.rails_path_for(:view)
-
-    TextMate.line_number = '3'
-    current_file = RailsPath.new(FIXTURE_PATH + '/app/controllers/user_controller.rb')
-    assert_equal RailsPath.new(FIXTURE_PATH + '/app/views/user/new.rhtml'), current_file.rails_path_for(:view)
-
-    # 2.0 plural controllers
-    current_file = RailsPath.new(FIXTURE_PATH + '/app/controllers/users_controller.rb')
-    assert_equal RailsPath.new(FIXTURE_PATH + '/app/views/users/new.html.erb'), current_file.rails_path_for(:view)
-
-    # Test view to controller
-    current_file = RailsPath.new(FIXTURE_PATH + '/app/views/user/new.html.erb')
-    assert_equal RailsPath.new(FIXTURE_PATH + '/app/controllers/users_controller.rb'), current_file.rails_path_for(:controller)
-
-    # 2.0 plural controllers
-    current_file = RailsPath.new(FIXTURE_PATH + '/app/views/users/new.html.erb')
-    assert_equal RailsPath.new(FIXTURE_PATH + '/app/controllers/users_controller.rb'), current_file.rails_path_for(:controller)
-
-    ENV['RAILS_VIEW_EXT'] = nil
-    # view defaults from respond_to block
-    challenges = [
-      [11, 'no_existing_views.html.erb'],
-      [12, 'no_existing_views.html.erb'],
-      [13, 'no_existing_views.js.rjs'],
-      [14, 'no_existing_views.js.rjs'],
-      [15, 'no_existing_views.js.rjs'],
-      [16, 'no_existing_views.xml.builder'],
-      [17, 'no_existing_views.wacky.erb'],
-      [18, 'no_existing_views.wacky.erb'],
-
-      [22, 'existing_views.html.erb'],
-      [23, 'existing_views.html.erb'],
-      [24, 'existing_views.js.rjs'],
-      [25, 'existing_views.js.rjs'],
-      [26, 'existing_views.js.rjs'],
-      [27, 'existing_views.xml.builder'],
-      [28, 'existing_views.wacky.erb'],
-      [28, 'existing_views.wacky.erb'],
-    ]
-    challenges.each do |line, expected|
-      TextMate.line_number = line.to_s
-      current_file = RailsPath.new(FIXTURE_PATH + '/app/controllers/users_controller.rb')
-      assert_equal(
-        RailsPath.new(FIXTURE_PATH + '/app/views/users/' + expected),
-        current_file.rails_path_for(:view),
-        "Mismatch for line #{line}, should be #{expected}"
-      )
-    end
-
-    # test wacky
-    assert_equal(nil, 
-                 @rp_wacky.rails_path_for(:controller), 
-                 "wacky/wackier.rb has no associations") 
-  end
-
-  def test_file_parts
-    current_file = RailsPath.new(FIXTURE_PATH + '/app/views/users/new.html.erb')
-    assert_equal(FIXTURE_PATH + '/app/views/users/new.html.erb', current_file.filepath)
-    pathname, basename, content_type, extension = current_file.parse_file_parts
-    assert_equal(FIXTURE_PATH + '/app/views/users', pathname)
-    assert_equal('new', basename)
-    assert_equal('html', content_type)
-    assert_equal('erb', extension)
-
-    current_file = RailsPath.new(FIXTURE_PATH + '/app/views/user/new.rhtml')
-    pathname, basename, content_type, extension = current_file.parse_file_parts
-    assert_equal(FIXTURE_PATH + '/app/views/user', pathname)
-    assert_equal('new', basename)
-    assert_equal(nil, content_type)
-    assert_equal('rhtml', extension)
-  end
-
-  def test_new_rails_path_has_parts
-    current_file = RailsPath.new(FIXTURE_PATH + '/app/views/users/new.html.erb')
-    assert_equal(FIXTURE_PATH + '/app/views/users/new.html.erb', current_file.filepath)
-    assert_equal(FIXTURE_PATH + '/app/views/users', current_file.path_name)
-    assert_equal('new', current_file.file_name)
-    assert_equal('html', current_file.content_type)
-    assert_equal('erb', current_file.extension)
-  end
-
-  def test_best_match
-    assert_equal(nil, RailsPath.new(FIXTURE_PATH + '/config/boot.rb').best_match)
-    assert_equal(:functional_test, RailsPath.new(FIXTURE_PATH + '/app/controllers/posts_controller.rb').best_match)
-    assert_equal(:model, RailsPath.new(FIXTURE_PATH + '/app/controllers/users_controller.rb').best_match)
-    assert_equal(:functional_test, RailsPath.new(FIXTURE_PATH + '/app/controllers/admin/base_controller.rb').best_match)
-
-    TextMate.line_number = '3' # edit action
-    assert_equal(:view, RailsPath.new(FIXTURE_PATH + '/app/controllers/admin/base_controller.rb').best_match)
-    TextMate.line_number = '0'
-
-    assert_equal(:controller, RailsPath.new(FIXTURE_PATH + '/app/views/users/new.html.erb').best_match)
-    assert_equal(:controller, RailsPath.new(FIXTURE_PATH + '/app/views/user/new.rhtml').best_match)
-    assert_equal(:controller, RailsPath.new(FIXTURE_PATH + '/app/views/admin/base/action.html.erb').best_match)
-    assert_equal(:model, RailsPath.new(FIXTURE_PATH + '/app/views/notifier/forgot_password.html.erb').best_match)
-    assert_equal(:controller, RailsPath.new(FIXTURE_PATH + '/app/views/books/new.haml').best_match)
-  end
-
-  def test_wants_haml
-    begin
-      assert_equal false, @rp_view.wants_haml
-      haml_fixture_path = File.expand_path(File.dirname(__FILE__) + '/fixtures')
-      TextMate.project_directory = haml_fixture_path
-      assert_equal true, RailsPath.new(haml_fixture_path + '/app/views/posts/index.html.haml').wants_haml
-    ensure
-      TextMate.project_directory = File.expand_path(File.dirname(__FILE__) + '/app_fixtures')
-    end
-  end
-
-  def test_haml
-    begin
-      haml_fixture_path = File.expand_path(File.dirname(__FILE__) + '/fixtures')
-      TextMate.project_directory = haml_fixture_path
-
-      assert_equal [], RailsPath.new(haml_fixture_path + '/public/stylesheets/sass/posts.sass').modules
-      assert_equal ["admin"], RailsPath.new(haml_fixture_path + '/public/stylesheets/sass/admin/posts.sass').modules
-
-      # Going from controller to view
-      current_file = RailsPath.new(haml_fixture_path + '/app/controllers/posts_controller.rb')
-      TextMate.line_number = '2'
-      assert_equal RailsPath.new(haml_fixture_path + '/app/views/posts/new.html.haml'), current_file.rails_path_for(:view)
-
-      current_file = RailsPath.new(haml_fixture_path + '/app/controllers/posts_controller.rb')
-      TextMate.line_number = '12'
-      assert_equal RailsPath.new(haml_fixture_path + '/app/views/posts/index.html.haml'), current_file.rails_path_for(:view)
-
-      current_file = RailsPath.new(haml_fixture_path + '/app/controllers/posts_controller.rb')
-      TextMate.line_number = '13'
-      assert_equal RailsPath.new(haml_fixture_path + '/app/views/posts/index.xml.builder'), current_file.rails_path_for(:view)
-
-      current_file = RailsPath.new(haml_fixture_path + '/app/controllers/posts_controller.rb')
-      TextMate.line_number = '14'
-      assert_equal RailsPath.new(haml_fixture_path + '/app/views/posts/index.js.rjs'), current_file.rails_path_for(:view)
-
-      current_file = RailsPath.new(haml_fixture_path + '/app/controllers/posts_controller.rb')
-      TextMate.line_number = '15'
-      assert_equal RailsPath.new(haml_fixture_path + '/app/views/posts/index.wacky.haml'), current_file.rails_path_for(:view)
-
-      # Going from view to controller
-      current_file = RailsPath.new(haml_fixture_path + '/app/views/posts/index.html.haml')
-      assert_equal RailsPath.new(haml_fixture_path + '/app/controllers/posts_controller.rb'), current_file.rails_path_for(:controller)
-
-      # Going from view to stylesheet
-      current_file = RailsPath.new(haml_fixture_path + '/app/views/posts/index.html.haml')
-      assert_equal RailsPath.new(haml_fixture_path + '/public/stylesheets/sass/posts.sass'), current_file.rails_path_for(:stylesheet)
-
-      # Going from stylesheet to helper
-      current_file = RailsPath.new(haml_fixture_path + '/public/stylesheets/sass/posts.sass')
-      assert_equal RailsPath.new(haml_fixture_path + '/app/helpers/posts_helper.rb'), current_file.rails_path_for(:helper)
-
-    ensure
-      TextMate.project_directory = File.expand_path(File.dirname(__FILE__) + '/app_fixtures')
-    end
-  end
-
-end
\ No newline at end of file
diff --git a/bundles/ruby-on-rails.tmbundle/Support/test/test_text_mate.rb b/bundles/ruby-on-rails.tmbundle/Support/test/test_text_mate.rb
deleted file mode 100644
index a086bd16e..000000000
--- a/bundles/ruby-on-rails.tmbundle/Support/test/test_text_mate.rb
+++ /dev/null
@@ -1 +0,0 @@
-require File.dirname(__FILE__) + '/test_helper'
diff --git a/bundles/ruby-on-rails.tmbundle/Support/test/text_mate_mock.rb b/bundles/ruby-on-rails.tmbundle/Support/test/text_mate_mock.rb
deleted file mode 100644
index e720fd705..000000000
--- a/bundles/ruby-on-rails.tmbundle/Support/test/text_mate_mock.rb
+++ /dev/null
@@ -1,45 +0,0 @@
-require 'rails/text_mate'
-
-TM_VARIABLE_DEFAULTS = {
-  :bundle_path    => "~/Library/Application Support/TextMate/Bundles/TextMate.tmbundle",
-  :bundle_support => "~/Library/Application Support/TextMate/Bundles/TextMate.tmbundle/Support",
-  :columns        => "100",
-  :column_number  => "1",
-  :comment_end    => "",
-  :comment_mode   => "line",
-  :comment_start  => "# ",
-  :current_line   => "",
-  :directory      => "~/Library/Application Support/TextMate/Bundles/TextMate.tmbundle/Support/test",
-  :filename       => "text_mate_mock.rb",
-  :filepath       => "~/Library/Application Support/TextMate/Bundles/Rails.tmbundle/Support/test/text_mate_mock.rb",
-  :line_index     => "0",
-  :line_number    => "4",
-  :mode           => "Ruby on Rails",
-  :organization_name => "syncPEOPLE",
-  :project_directory => "~/Library/Application Support/TextMate/Bundles/Rails.tmbundle",
-  :project_filepath  => "~/Library/Application Support/TextMate/Bundles/Rails.tmbundle/Rails.tmproj",
-  :scope          => "source.ruby.rails",
-  :selected_file  => "~/Library/Application Support/TextMate/Bundles/Rails.tmbundle/Support/test/text_mate_mock.rb",
-  :selected_files => "'~/Library/Application Support/TextMate/Bundles/Rails.tmbundle/Support/test/text_mate_mock.rb'",
-  :selected_text  => "",
-  :soft_tabs      => "YES",
-  :support_path   => "~/Library/Application Support/TextMate/Support",
-  :tab_size       => "2" }
-
-module TextMate
-  class <<self
-    TM_VARIABLE_DEFAULTS.each_pair do |key, value|
-      eval "@@#{key} = %q{#{value}}"
-      eval "def #{key}; @@#{key} end" unless TextMate.methods.include?(key.to_s)
-      eval "def #{key}=(v); @@#{key} = v end"
-    end
-
-    def open_url(url)
-      "open \"#{url}\""
-    end
-
-    def env(var)
-      TextMate.class_eval("@@#{var}")
-    end
-  end
-end
\ No newline at end of file
diff --git a/bundles/ruby-on-rails.tmbundle/Syntaxes/HTML (Rails).plist b/bundles/ruby-on-rails.tmbundle/Syntaxes/HTML (Rails).plist
deleted file mode 100644
index 7fae1a3a5..000000000
--- a/bundles/ruby-on-rails.tmbundle/Syntaxes/HTML (Rails).plist	
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>fileTypes</key>
-	<array>
-		<string>rhtml</string>
-		<string>erb</string>
-		<string>html.erb</string>
-	</array>
-	<key>foldingStartMarker</key>
-	<string>(?x)
-		(&lt;(?i:head|body|table|thead|tbody|tfoot|tr|div|select|fieldset|style|script|ul|ol|form|dl)\b.*?&gt;
-		|&lt;!--(?!.*--&gt;)
-		|\{\s*($|\?&gt;\s*$|//|/\*(.*\*/\s*$|(?!.*?\*/)))
-		)</string>
-	<key>foldingStopMarker</key>
-	<string>(?x)
-		(&lt;/(?i:head|body|table|thead|tbody|tfoot|tr|div|select|fieldset|style|script|ul|ol|form|dl)&gt;
-		|^\s*--&gt;
-		|(^|\s)\}
-		)</string>
-	<key>keyEquivalent</key>
-	<string>^~R</string>
-	<key>name</key>
-	<string>HTML (Rails)</string>
-	<key>patterns</key>
-	<array>
-		<dict>
-			<key>begin</key>
-			<string>&lt;%+#</string>
-			<key>captures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.comment.erb</string>
-				</dict>
-			</dict>
-			<key>end</key>
-			<string>%&gt;</string>
-			<key>name</key>
-			<string>comment.block.erb</string>
-		</dict>
-		<dict>
-			<key>begin</key>
-			<string>&lt;%+(?!&gt;)[-=]?</string>
-			<key>captures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.section.embedded.ruby</string>
-				</dict>
-			</dict>
-			<key>end</key>
-			<string>-?%&gt;</string>
-			<key>name</key>
-			<string>source.ruby.rails.embedded.html</string>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>captures</key>
-					<dict>
-						<key>1</key>
-						<dict>
-							<key>name</key>
-							<string>punctuation.definition.comment.ruby</string>
-						</dict>
-					</dict>
-					<key>match</key>
-					<string>(#).*?(?=-?%&gt;)</string>
-					<key>name</key>
-					<string>comment.line.number-sign.ruby</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>source.ruby.rails</string>
-				</dict>
-			</array>
-		</dict>
-		<dict>
-			<key>include</key>
-			<string>text.html.basic</string>
-		</dict>
-	</array>
-	<key>scopeName</key>
-	<string>text.html.ruby</string>
-	<key>uuid</key>
-	<string>45D7E1FC-7D0B-4105-A1A2-3D10BB555A5C</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Syntaxes/JavaScript (Rails).tmLanguage b/bundles/ruby-on-rails.tmbundle/Syntaxes/JavaScript (Rails).tmLanguage
deleted file mode 100644
index fb9a9bc01..000000000
--- a/bundles/ruby-on-rails.tmbundle/Syntaxes/JavaScript (Rails).tmLanguage	
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>fileTypes</key>
-	<array>
-		<string>js.erb</string>
-	</array>
-	<key>foldingStartMarker</key>
-	<string>/\*\*|\{\s*$</string>
-	<key>foldingStopMarker</key>
-	<string>\*\*/|^\s*\}</string>
-	<key>keyEquivalent</key>
-	<string>^~J</string>
-	<key>name</key>
-	<string>JavaScript (Rails)</string>
-	<key>patterns</key>
-	<array>
-		<dict>
-			<key>begin</key>
-			<string>&lt;%+#</string>
-			<key>captures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.comment.erb</string>
-				</dict>
-			</dict>
-			<key>end</key>
-			<string>%&gt;</string>
-			<key>name</key>
-			<string>comment.block.erb</string>
-		</dict>
-		<dict>
-			<key>begin</key>
-			<string>&lt;%+(?!&gt;)[-=]?</string>
-			<key>captures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.section.embedded.ruby</string>
-				</dict>
-			</dict>
-			<key>end</key>
-			<string>-?%&gt;</string>
-			<key>name</key>
-			<string>source.ruby.rails.erb</string>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>captures</key>
-					<dict>
-						<key>1</key>
-						<dict>
-							<key>name</key>
-							<string>punctuation.definition.comment.ruby</string>
-						</dict>
-					</dict>
-					<key>match</key>
-					<string>(#).*?(?=-?%&gt;)</string>
-					<key>name</key>
-					<string>comment.line.number-sign.ruby</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>source.ruby.rails</string>
-				</dict>
-			</array>
-		</dict>
-		<dict>
-			<key>include</key>
-			<string>source.js</string>
-		</dict>
-	</array>
-	<key>scopeName</key>
-	<string>source.js.rails</string>
-	<key>uuid</key>
-	<string>4A3E6DA7-67A3-45B1-9EE0-ECFF9C7FA6C0</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Syntaxes/RJS.tmLanguage b/bundles/ruby-on-rails.tmbundle/Syntaxes/RJS.tmLanguage
deleted file mode 100644
index 15017e7ad..000000000
--- a/bundles/ruby-on-rails.tmbundle/Syntaxes/RJS.tmLanguage
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>fileTypes</key>
-	<array>
-		<string>rjs</string>
-	</array>
-	<key>keyEquivalent</key>
-	<string>^~R</string>
-	<key>name</key>
-	<string>RJS</string>
-	<key>patterns</key>
-	<array>
-		<dict>
-			<key>include</key>
-			<string>source.ruby</string>
-		</dict>
-	</array>
-	<key>scopeName</key>
-	<string>source.ruby.rails.rjs</string>
-	<key>uuid</key>
-	<string>A6AE60CD-18CA-4474-BE7A-5255BC3EF083</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Syntaxes/Ruby on Rails.plist b/bundles/ruby-on-rails.tmbundle/Syntaxes/Ruby on Rails.plist
deleted file mode 100644
index 6f7b4527b..000000000
--- a/bundles/ruby-on-rails.tmbundle/Syntaxes/Ruby on Rails.plist	
+++ /dev/null
@@ -1,288 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>fileTypes</key>
-	<array>
-		<string>rb</string>
-		<string>rxml</string>
-		<string>builder</string>
-	</array>
-	<key>foldingStartMarker</key>
-	<string>(?x)^
-	    (\s*+
-	        (module|class|def
-	        |unless|if
-	        |case
-	        |begin
-	        |for|while|until
-	        |(  "(\\.|[^"])*+"          # eat a double quoted string
-	         | '(\\.|[^'])*+'        # eat a single quoted string
-	         |   [^#"']                # eat all but comments and strings
-	         )*
-	         (                 \s   (do|begin|case)
-	         | [-+=&amp;|*/~%^&lt;&gt;~] \s*+ (if|unless)
-	         )
-	        )\b
-	        (?! [^;]*+ ; .*? \bend\b )
-	    |(  "(\\.|[^"])*+"              # eat a double quoted string
-	     | '(\\.|[^'])*+'            # eat a single quoted string
-	     |   [^#"']                    # eat all but comments and strings
-	     )*
-	     ( \{ (?!  [^}]*+ \} )
-	     | \[ (?! [^\]]*+ \] )
-	     )
-	    ).*$
-	|   [#] .*? \(fold\) \s*+ $         # Sune’s special marker
-	</string>
-	<key>foldingStopMarker</key>
-	<string>(?x)
-		(   (^|;) \s*+ end   \s*+ ([#].*)? $
-		|   ^     \s*+ [}\]] \s*+ ([#].*)? $
-		|   [#] .*? \(end\) \s*+ $    # Sune’s special marker
-		)</string>
-	<key>keyEquivalent</key>
-	<string>^~R</string>
-	<key>name</key>
-	<string>Ruby on Rails</string>
-	<key>patterns</key>
-	<array>
-		<dict>
-			<key>begin</key>
-			<string>(^\s*)(?=class\s+(([.a-zA-Z0-9_:]+ControllerTest(\s*&lt;\s*[.a-zA-Z0-9_:]+)?)))</string>
-			<key>comment</key>
-			<string>Uses lookahead to match classes with the ControllerTest suffix; includes 'source.ruby' to avoid infinite recursion</string>
-			<key>end</key>
-			<string>^\1(?=end)\b</string>
-			<key>name</key>
-			<string>meta.rails.functional_test</string>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>include</key>
-					<string>source.ruby</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>$self</string>
-				</dict>
-			</array>
-		</dict>
-		<dict>
-			<key>begin</key>
-			<string>(^\s*)(?=class\s+(([.a-zA-Z0-9_:]+Controller\b(\s*&lt;\s*[.a-zA-Z0-9_:]+)?)|(&lt;&lt;\s*[.a-zA-Z0-9_:]+)))(?!.+\bend\b)</string>
-			<key>comment</key>
-			<string>Uses lookahead to match classes with the Controller suffix; includes 'source.ruby' to avoid infinite recursion</string>
-			<key>end</key>
-			<string>^\1(?=end)\b</string>
-			<key>name</key>
-			<string>meta.rails.controller</string>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>include</key>
-					<string>source.ruby</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>$self</string>
-				</dict>
-			</array>
-		</dict>
-		<dict>
-			<key>begin</key>
-			<string>(^\s*)(?=module\s+((([A-Z]\w*::)*)[A-Z]\w*)Helper)</string>
-			<key>comment</key>
-			<string>Uses lookahead to match modules with the Helper suffix; includes 'source.ruby' to avoid infinite recursion</string>
-			<key>end</key>
-			<string>^\1(?=end)\b</string>
-			<key>name</key>
-			<string>meta.rails.helper</string>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>include</key>
-					<string>source.ruby</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>$self</string>
-				</dict>
-			</array>
-		</dict>
-		<dict>
-			<key>begin</key>
-			<string>(^\s*)(?=class\s+(([.a-zA-Z0-9_:]+(\s*&lt;\s*ActionMailer::Base))))</string>
-			<key>comment</key>
-			<string>Uses lookahead to match classes that inherit from ActionMailer::Base; includes 'source.ruby' to avoid infinite recursion</string>
-			<key>end</key>
-			<string>^\1(?=end)\b</string>
-			<key>name</key>
-			<string>meta.rails.mailer</string>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>include</key>
-					<string>source.ruby</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>$self</string>
-				</dict>
-			</array>
-		</dict>
-		<dict>
-			<key>begin</key>
-			<string>(^\s*)(?=class\s+.+ActiveRecord::Base)</string>
-			<key>comment</key>
-			<string>Uses lookahead to match classes that (may) inherit from ActiveRecord::Base; includes 'source.ruby' to avoid infinite recursion</string>
-			<key>end</key>
-			<string>^\1(?=end)\b</string>
-			<key>name</key>
-			<string>meta.rails.model</string>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>include</key>
-					<string>source.ruby</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>$self</string>
-				</dict>
-			</array>
-		</dict>
-		<dict>
-			<key>begin</key>
-			<string>(^\s*)(?=class\s+.+ActiveRecord::Migration)</string>
-			<key>comment</key>
-			<string>Uses lookahead to match classes that (may) inherit from ActiveRecord::Migration; includes 'source.ruby' to avoid infinite recursion</string>
-			<key>end</key>
-			<string>^\1(?=end)\b</string>
-			<key>name</key>
-			<string>meta.rails.migration</string>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>begin</key>
-					<string>(^\s*)(?=change_table)\b</string>
-					<key>comment</key>
-					<string>Uses lookahead to match methods change_table; includes 'source.ruby' to avoid infinite recursion</string>
-					<key>contentName</key>
-					<string>meta.rails.migration.change_table</string>
-					<key>end</key>
-					<string>^\1(?=end)\b</string>
-					<key>patterns</key>
-					<array>
-						<dict>
-							<key>include</key>
-							<string>source.ruby</string>
-						</dict>
-						<dict>
-							<key>include</key>
-							<string>$self</string>
-						</dict>
-					</array>
-				</dict>
-				<dict>
-					<key>begin</key>
-					<string>(^\s*)(?=create_table)\b</string>
-					<key>comment</key>
-					<string>Uses lookahead to match methods create_table; includes 'source.ruby' to avoid infinite recursion</string>
-					<key>contentName</key>
-					<string>meta.rails.migration.create_table</string>
-					<key>end</key>
-					<string>^\1(?=end)\b</string>
-					<key>patterns</key>
-					<array>
-						<dict>
-							<key>include</key>
-							<string>source.ruby</string>
-						</dict>
-						<dict>
-							<key>include</key>
-							<string>$self</string>
-						</dict>
-					</array>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>source.ruby</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>$self</string>
-				</dict>
-			</array>
-		</dict>
-		<dict>
-			<key>begin</key>
-			<string>(^\s*)(?=class\s+(?![.a-zA-Z0-9_:]+ControllerTest)(([.a-zA-Z0-9_:]+Test(\s*&lt;\s*[.a-zA-Z0-9_:]+)?)|(&lt;&lt;\s*[.a-zA-Z0-9_:]+)))</string>
-			<key>comment</key>
-			<string>Uses lookahead to match classes with the Test suffix; includes 'source.ruby' to avoid infinite recursion</string>
-			<key>end</key>
-			<string>^\1(?=end)\b</string>
-			<key>name</key>
-			<string>meta.rails.unit_test</string>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>include</key>
-					<string>source.ruby</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>$self</string>
-				</dict>
-			</array>
-		</dict>
-		<dict>
-			<key>begin</key>
-			<string>(^\s*)ActionController::Routing::Routes</string>
-			<key>comment</key>
-			<string>Uses ActionController::Routing::Routes to determine it is a routes file; includes 'source.ruby' to avoid infinite recursion</string>
-			<key>end</key>
-			<string>^\1(?=end)\b</string>
-			<key>name</key>
-			<string>meta.rails.routes</string>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>include</key>
-					<string>source.ruby</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>$self</string>
-				</dict>
-			</array>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>\b(before_filter|skip_before_filter|skip_after_filter|after_filter|around_filter|filter|filter_parameter_logging|layout|require_dependency|render|render_action|render_text|render_file|render_template|render_nothing|render_component|render_without_layout|rescue_from|url_for|redirect_to|redirect_to_path|redirect_to_url|respond_to|helper|helper_method|model|service|observer|serialize|scaffold|verify|hide_action)\b</string>
-			<key>name</key>
-			<string>support.function.actionpack.rails</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>\b(named_scope|after_create|after_destroy|after_save|after_update|after_validation|after_validation_on_create|after_validation_on_update|before_create|before_destroy|before_save|before_update|before_validation|before_validation_on_create|before_validation_on_update|composed_of|belongs_to|has_one|has_many|has_and_belongs_to_many|validate|validate_on_create|validates_numericality_of|validate_on_update|validates_acceptance_of|validates_associated|validates_confirmation_of|validates_each|validates_format_of|validates_inclusion_of|validates_exclusion_of|validates_length_of|validates_presence_of|validates_size_of|validates_uniqueness_of|attr_protected|attr_accessible|attr_readonly)\b</string>
-			<key>name</key>
-			<string>support.function.activerecord.rails</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>\b(alias_method_chain|alias_attribute|delegate|cattr_accessor|mattr_accessor|returning)\b</string>
-			<key>name</key>
-			<string>support.function.activesupport.rails</string>
-		</dict>
-		<dict>
-			<key>include</key>
-			<string>source.ruby</string>
-		</dict>
-	</array>
-	<key>scopeName</key>
-	<string>source.ruby.rails</string>
-	<key>uuid</key>
-	<string>54D6E91E-8F31-11D9-90C5-0011242E4184</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/Syntaxes/SQL (Rails).plist b/bundles/ruby-on-rails.tmbundle/Syntaxes/SQL (Rails).plist
deleted file mode 100644
index cfb581e68..000000000
--- a/bundles/ruby-on-rails.tmbundle/Syntaxes/SQL (Rails).plist	
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>fileTypes</key>
-	<array>
-		<string>erbsql</string>
-		<string>sql.erb</string>
-	</array>
-	<key>foldingStartMarker</key>
-	<string>\s*\(\s*$</string>
-	<key>foldingStopMarker</key>
-	<string>^\s*\)</string>
-	<key>keyEquivalent</key>
-	<string>^~R</string>
-	<key>name</key>
-	<string>SQL (Rails)</string>
-	<key>patterns</key>
-	<array>
-		<dict>
-			<key>begin</key>
-			<string>&lt;%+(?!&gt;)=?</string>
-			<key>end</key>
-			<string>%&gt;</string>
-			<key>name</key>
-			<string>source.ruby.rails.embedded.sql</string>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>match</key>
-					<string>#.*?(?=%&gt;)</string>
-					<key>name</key>
-					<string>comment.line.number-sign.ruby</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>source.ruby.rails</string>
-				</dict>
-			</array>
-		</dict>
-		<dict>
-			<key>include</key>
-			<string>source.sql</string>
-		</dict>
-	</array>
-	<key>scopeName</key>
-	<string>source.sql.ruby</string>
-	<key>uuid</key>
-	<string>D54FBDED-5481-4CC7-B75F-66465A499882</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/TODO b/bundles/ruby-on-rails.tmbundle/TODO
deleted file mode 100644
index cd78a43f0..000000000
--- a/bundles/ruby-on-rails.tmbundle/TODO
+++ /dev/null
@@ -1,24 +0,0 @@
-== TODO - From Dr Nic ==
-
-- Call Generate Script - dynamically load generator names (bin/generate.rb)
-
-== TODO - From Duane ==
-- Let RailsPath recognize application.rb as a controller
-- Remove extraneous dirname from setting each RUBYLIB -- remove from plugins too?
-- License for footnotes?
-- Chop rails_root from inline-partial-edit-mode's partial names
-- Use <div> instead of <!-- --> for inline-partial-edit-mode?  May allow for folding.
-- Remove indentation from partials during create-partial-from-selection
-- Add indentation to partials when entering inline-partial-edit-mode
-- Add indentation to erb fragment that replaces the partials after create-partial-from-selection
-- Intelligent Go To File needs to look for rxml and rjs files
-  - pop up window asking for filename on create (if view doesn't exist, for example)
-- Fix inline-partial mode for rjs files (<!-- style comments don't work well in ruby code)
-- Use scope hints to make more intelligent actions:
-  - e.g. if inside source.css.embedded.html create a css file instead of a partial with create-from-selection
-  - source.ruby.rails: unit tests, controllers, models
-
-- Make the backtracer find "extracted source" lines as well [done]
-- Make go-to-file go to unit test (esp. from models)
-- List common rake tasks in a pop-up menu and execute? db_schema_import db_schema_dump migrate
-- Jump to environment.rb, database.yml
diff --git a/bundles/ruby-on-rails.tmbundle/config/deploy.rb b/bundles/ruby-on-rails.tmbundle/config/deploy.rb
deleted file mode 100644
index 2b3ba6906..000000000
--- a/bundles/ruby-on-rails.tmbundle/config/deploy.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-set :application, "railsbundle"
-
-require "slicehost/recipes/capistrano"
-# Used to setup/update DNS registry of url => ip
-set :domain_mapping, "railsbundle.com" => "208.78.99.82"
-set :slicehost_config, File.dirname(__FILE__) + "/slicehost.yml"
diff --git a/bundles/ruby-on-rails.tmbundle/config/slicehost.yml.sample b/bundles/ruby-on-rails.tmbundle/config/slicehost.yml.sample
deleted file mode 100644
index 81d8a4529..000000000
--- a/bundles/ruby-on-rails.tmbundle/config/slicehost.yml.sample
+++ /dev/null
@@ -1,3 +0,0 @@
----
-email: your@email.com
-password: yourpassword
\ No newline at end of file
diff --git a/bundles/ruby-on-rails.tmbundle/config/website.yml.sample b/bundles/ruby-on-rails.tmbundle/config/website.yml.sample
deleted file mode 100644
index 232e100f5..000000000
--- a/bundles/ruby-on-rails.tmbundle/config/website.yml.sample
+++ /dev/null
@@ -1,2 +0,0 @@
-host: your_username@rubyforge.org
-remote_dir: /var/www/gforge-projects/Ruby on Rails.tmbundle
diff --git a/bundles/ruby-on-rails.tmbundle/info.plist b/bundles/ruby-on-rails.tmbundle/info.plist
deleted file mode 100644
index 460c8fa75..000000000
--- a/bundles/ruby-on-rails.tmbundle/info.plist
+++ /dev/null
@@ -1,889 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>contactEmailRot13</key>
-	<string>pnanqnqhnar@tznvy.pbz</string>
-	<key>contactName</key>
-	<string>Duane Johnson</string>
-	<key>deleted</key>
-	<array>
-		<string>43A61A22-6BEE-4997-961C-1CDE739C05FE</string>
-		<string>18E92576-51A9-4A2E-827C-ADF89C336F3C</string>
-		<string>0EDBB05F-3347-42B2-A7C6-0780BE889CF6</string>
-		<string>841B70B0-EA8C-471C-AADD-C6ACE8820C08</string>
-		<string>66708719-62C3-11D9-B8CF-000D93589AF6</string>
-		<string>CE790B98-875B-11D9-897C-000393CBCE2E</string>
-		<string>854EF1DA-875B-11D9-897C-000393CBCE2E</string>
-		<string>EB781D86-84C5-11D9-A094-000D932CD5BA</string>
-		<string>F8EE4249-84C5-11D9-A094-000D932CD5BA</string>
-		<string>060DC5CD-84C6-11D9-A094-000D932CD5BA</string>
-		<string>59A47C33-97C5-411D-ADBE-ABD2324BD130</string>
-		<string>23BAF50A-CAFC-468E-929C-B6EAC75937A8</string>
-		<string>C3ED4A88-B9CF-4F2B-B195-3C582ED58C5F</string>
-		<string>0D8DA40B-0652-42E8-AB20-5B6847DC2F11</string>
-		<string>86DD56A8-C655-49DA-997B-8929E5D9407E</string>
-		<string>F0A39EAD-6D01-437B-9A79-468E0571CB3D</string>
-		<string>43304E62-66F7-424D-8AF6-33E0237BF349</string>
-	</array>
-	<key>description</key>
-	<string>&lt;a href="http://www.rubyonrails.com/"&gt;Ruby on Rails&lt;/a&gt; is a full-stack framework for developing database-backed web applications, in Ruby, according to the Model-View-Control pattern.</string>
-	<key>mainMenu</key>
-	<dict>
-		<key>excludedItems</key>
-		<array>
-			<string>A2135370-67A1-488D-B43C-B4F221127C2F</string>
-			<string>809BCA42-5C49-4B08-B3C4-BB773036C086</string>
-		</array>
-		<key>items</key>
-		<array>
-			<string>D4D18AD6-11DA-47F2-AAD8-F2F350EE2BB9</string>
-			<string>5FBC0312-D9B1-11DC-94E9-00112475D960</string>
-			<string>------------------------------------</string>
-			<string>4904EDC7-5ED3-4132-AAB2-C2AD87C97EFE</string>
-			<string>46ECE243-0448-4A64-A223-27CC21E7704D</string>
-			<string>88B6256D-A8BF-46A9-8A6B-651D089D5F67</string>
-			<string>------------------------------------</string>
-			<string>AC8EDA3E-875B-11D9-897C-000393CBCE2E</string>
-			<string>7B02ABF8-8763-11D9-897C-000393CBCE2E</string>
-			<string>A229B2F8-21B4-4910-AA61-6672A48C2991</string>
-			<string>------------------------------------</string>
-			<string>5CCEA099-4B20-4BC3-96B9-BD9BF57279F5</string>
-			<string>6E2BC67D-4CC8-47F1-AF7C-341D74E0F803</string>
-			<string>EE4BA904-F727-4C6B-A2CB-602E30537E38</string>
-			<string>5103D78F-C1FA-46F4-B6C7-39FC59EC591B</string>
-			<string>2005C9DA-00DD-43D7-9F59-169CC8E953FC</string>
-			<string>054985A5-E001-462A-8674-47C02C751A80</string>
-			<string>A1D9600C-4E0B-4ABF-9C0A-19AD7A168A15</string>
-			<string>083B7598-7DA0-4BDE-BBD3-290F06927E48</string>
-			<string>------------------------------------</string>
-			<string>4D3A01D4-ACA8-49AF-B1DD-428B823964C3</string>
-			<string>E34453D0-68EB-408C-AE49-990663DE18F7</string>
-			<string>8113246B-122E-4F4A-9B5A-98390900839E</string>
-			<string>9EB71DE4-93D3-466C-B1D8-54892538FF3A</string>
-			<string>------------------------------------</string>
-			<string>964436B8-E578-11DC-8177-00112475D960</string>
-		</array>
-		<key>submenus</key>
-		<dict>
-			<key>00C5D7D2-DA7A-4FA4-A787-EABC00B051CB</key>
-			<dict>
-				<key>items</key>
-				<array>
-					<string>3BDD0D52-443E-4F5F-AE09-ABCC2ABE9A42</string>
-					<string>B41D3164-EA53-4DDC-850E-27B82B24061F</string>
-					<string>3F26FDB4-ACF9-4856-9312-6A4D78DC8564</string>
-				</array>
-				<key>name</key>
-				<string>respond_to</string>
-			</dict>
-			<key>054985A5-E001-462A-8674-47C02C751A80</key>
-			<dict>
-				<key>items</key>
-				<array>
-					<string>D696FA2C-785A-4B73-A2F6-F750904DD7C2</string>
-					<string>------------------------------------</string>
-					<string>8D802011-B3E5-4BC1-A3E1-5B78A2A49C28</string>
-					<string>6909D8A7-461B-4D29-956F-8E633DD49A90</string>
-					<string>F4DD75AA-A954-4FBE-A03F-28718335414E</string>
-				</array>
-				<key>name</key>
-				<string>Migrations</string>
-			</dict>
-			<key>083B7598-7DA0-4BDE-BBD3-290F06927E48</key>
-			<dict>
-				<key>items</key>
-				<array>
-					<string>F57522B2-9F5F-4DF9-AE46-9478AF019C63</string>
-					<string>B25B7560-FACB-4A9E-A226-B71C796BD1F3</string>
-					<string>D2783155-23F3-4B90-A317-5BD139471193</string>
-				</array>
-				<key>name</key>
-				<string>ActiveSupport</string>
-			</dict>
-			<key>2005C9DA-00DD-43D7-9F59-169CC8E953FC</key>
-			<dict>
-				<key>items</key>
-				<array>
-					<string>273E5E76-8D13-4476-9C38-8AF87432CB96</string>
-					<string>390A447F-0FA3-4F01-A10C-4F35675E0A43</string>
-					<string>8B914165-9C66-4FA3-9AD6-1DA41B25F8F1</string>
-					<string>62BEA590-F4EF-4001-B661-764EDFB92811</string>
-					<string>CFDC27A3-58CF-4198-8F93-36360978F0D0</string>
-					<string>5ACBF49D-B5A5-495C-89D8-18AA740D9D02</string>
-					<string>028DA0A4-B310-4BEF-8643-2A22993C21C7</string>
-				</array>
-				<key>name</key>
-				<string>RJS</string>
-			</dict>
-			<key>245AD020-669A-46E1-8123-4B9CFDF8075A</key>
-			<dict>
-				<key>items</key>
-				<array>
-					<string>326B57A7-B4A9-447B-A3D2-0EA74158E1E1</string>
-					<string>6BA737F0-63D1-4D82-9381-4331E18B12C5</string>
-					<string>750DEEF9-18A0-40FC-8E54-574CE5EE5565</string>
-					<string>866AAD87-E458-4F2D-9E7C-3CE73EFC047B</string>
-					<string>9E2B42FE-7BC8-11D9-906A-000D932CD5BA</string>
-					<string>B4F952F4-7BC8-11D9-906A-000D932CD5BA</string>
-					<string>74590E16-7BCB-11D9-906A-000D932CD5BA</string>
-					<string>C11C0BF5-7BC8-11D9-906A-000D932CD5BA</string>
-					<string>D21BE958-7BC8-11D9-906A-000D932CD5BA</string>
-					<string>E5E08AA0-4EDD-4583-BF07-5D6C49E98410</string>
-				</array>
-				<key>name</key>
-				<string>link_to</string>
-			</dict>
-			<key>3DF64504-EE4E-4EA2-BE81-80D8DE446656</key>
-			<dict>
-				<key>items</key>
-				<array>
-					<string>1CB65A0D-4FEC-4438-9B4F-8B0BD13FB875</string>
-					<string>4E286CB4-069E-474C-A970-95216FE7DE95</string>
-				</array>
-				<key>name</key>
-				<string>Scopes</string>
-			</dict>
-			<key>4D3A01D4-ACA8-49AF-B1DD-428B823964C3</key>
-			<dict>
-				<key>items</key>
-				<array>
-					<string>786980D8-FA69-4542-85A3-5E48CFAA6814</string>
-					<string>9671EB7A-89D6-4C23-914F-88CBEE0D177A</string>
-					<string>------------------------------------</string>
-					<string>0BCF0EE2-35EE-4959-A771-E74D55271D5A</string>
-					<string>275C0B86-F735-49B6-8A22-218A8F4CC2E0</string>
-				</array>
-				<key>name</key>
-				<string>Fixtures</string>
-			</dict>
-			<key>5103D78F-C1FA-46F4-B6C7-39FC59EC591B</key>
-			<dict>
-				<key>items</key>
-				<array>
-					<string>FEF49C86-9386-405E-A191-684D1C963E3A</string>
-					<string>980C7667-9D60-49FF-AF74-A7B19B379F45</string>
-				</array>
-				<key>name</key>
-				<string>Layouts</string>
-			</dict>
-			<key>53D8F022-29C2-4E3D-B83E-801DD80683FE</key>
-			<dict>
-				<key>items</key>
-				<array>
-					<string>7B03D38B-7580-41AC-BC2B-3766AB074A43</string>
-					<string>053F1D6A-B413-43FF-B697-E3120FD0489F</string>
-					<string>7D43B0EA-2C3C-499B-9346-A8E48CBF29CD</string>
-					<string>2A8FBE48-E196-4019-AE76-BF3ED4B54F47</string>
-					<string>64E93A71-6E62-48D9-9694-123080AE6723</string>
-					<string>1E5DE984-510C-4992-8AD5-C5FA6D7F2A88</string>
-					<string>A8AF8B90-94E8-42E1-8057-DDBA57809F6A</string>
-					<string>3F83272F-62D5-4BCB-BAA3-806083078829</string>
-					<string>AC8A995F-0034-433C-905D-E5C1F29D6EFF</string>
-					<string>724A68C1-A727-46FF-AF59-288E26B09629</string>
-					<string>498168A5-5AF8-4F59-8A2D-B517FAB98CDB</string>
-					<string>046FB1B6-9C65-4702-91EC-4AA9878CD949</string>
-					<string>6F41AFFD-B3A7-42D0-8A84-D6086C118D92</string>
-					<string>BFAAC8DA-A043-4684-967B-B3E5DAE08C62</string>
-					<string>CBB06A4E-3A82-45F3-91AA-259F02314B9D</string>
-					<string>67C5082F-5011-434A-8EAA-6B8D3600935F</string>
-					<string>A3B09AFE-40B5-4623-8B85-E9F369ECE22D</string>
-					<string>97C0992D-715F-4322-A3E0-DD4D2B7E2FC2</string>
-					<string>4F636977-F7A6-4BF5-B09B-7F087683C3B9</string>
-					<string>ECB10C0B-E8B7-4606-ABF5-4A2A26E5AB1A</string>
-				</array>
-				<key>name</key>
-				<string>render</string>
-			</dict>
-			<key>5CCEA099-4B20-4BC3-96B9-BD9BF57279F5</key>
-			<dict>
-				<key>items</key>
-				<array>
-					<string>1970AE74-3949-40B3-B263-727AA3FF167A</string>
-					<string>------------------------------------</string>
-					<string>CD88AD5A-7F20-4D4C-882A-31E1CDFDFD16</string>
-					<string>B89CD2E9-4271-41BB-8AF6-A747553D99EB</string>
-					<string>3DF64504-EE4E-4EA2-BE81-80D8DE446656</string>
-					<string>A26B8A37-FAC0-4F44-B18D-6BE30D84F27E</string>
-					<string>7D9194BB-2BCC-4E20-84C8-0990B77D5515</string>
-				</array>
-				<key>name</key>
-				<string>Models</string>
-			</dict>
-			<key>5FBC0312-D9B1-11DC-94E9-00112475D960</key>
-			<dict>
-				<key>items</key>
-				<array>
-					<string>DC549A45-D9B0-11DC-94E9-00112475D960</string>
-					<string>F4EA552D-D9B0-11DC-94E9-00112475D960</string>
-					<string>04A30A4D-D9B1-11DC-94E9-00112475D960</string>
-					<string>0D966168-D9B1-11DC-94E9-00112475D960</string>
-					<string>190401C2-D9B1-11DC-94E9-00112475D960</string>
-					<string>212C3047-D9B1-11DC-94E9-00112475D960</string>
-					<string>2C60CBA1-D9B1-11DC-94E9-00112475D960</string>
-				</array>
-				<key>name</key>
-				<string>Run Tests</string>
-			</dict>
-			<key>6909D8A7-461B-4D29-956F-8E633DD49A90</key>
-			<dict>
-				<key>items</key>
-				<array>
-					<string>25F8F5D8-2BD1-45D8-8B2A-9F2EA4F73AA2</string>
-					<string>FD8CC811-2AD3-480F-B975-DF959DC96C67</string>
-					<string>20375601-B13F-4314-B8E4-362706566636</string>
-					<string>20FC02C5-32A3-4F20-B163-FF75C9FDFABF</string>
-					<string>------------------------------------</string>
-					<string>A66D3FEE-D537-11DC-BD8E-00112475D960</string>
-					<string>B5104C6E-E4BF-11DC-A11A-00112475D960</string>
-					<string>7592CA99-75D7-48B6-9133-00B9F148FF43</string>
-					<string>67FD2F8F-5F25-45F2-A451-2F39977A9EDE</string>
-					<string>93964B1A-33AB-4B4F-A92C-5138402EDB7C</string>
-					<string>BAEAEAA9-ECE9-4B42-B3FA-8249EEFACB6C</string>
-				</array>
-				<key>name</key>
-				<string>Tables</string>
-			</dict>
-			<key>6E2BC67D-4CC8-47F1-AF7C-341D74E0F803</key>
-			<dict>
-				<key>items</key>
-				<array>
-					<string>4B3F798E-E3B6-48C8-8C2F-CB8631011638</string>
-					<string>D864896E-8763-11D9-897C-000393CBCE2E</string>
-					<string>00C5D7D2-DA7A-4FA4-A787-EABC00B051CB</string>
-					<string>AA879356-48FB-48A6-8BF3-0EF40A592691</string>
-					<string>53D8F022-29C2-4E3D-B83E-801DD80683FE</string>
-					<string>7D82F39F-FDF4-4EE3-BA8F-4CA43A074804</string>
-					<string>------------------------------------</string>
-					<string>9ECBF20C-003E-41D9-A881-4BAC0656F9DC</string>
-					<string>7BBD3F57-57A5-4CD0-8E79-B931021FC110</string>
-				</array>
-				<key>name</key>
-				<string>Controllers</string>
-			</dict>
-			<key>7D82F39F-FDF4-4EE3-BA8F-4CA43A074804</key>
-			<dict>
-				<key>items</key>
-				<array>
-					<string>54F61419-001F-4B71-83AC-8DC633694AF0</string>
-				</array>
-				<key>name</key>
-				<string>REST methods</string>
-			</dict>
-			<key>7D9194BB-2BCC-4E20-84C8-0990B77D5515</key>
-			<dict>
-				<key>items</key>
-				<array>
-					<string>89198999-7E6D-4D97-A20E-45263E1CA993</string>
-					<string>A2477223-AD5A-4723-8052-943CE9BA634D</string>
-					<string>47944705-F605-4ED4-B4C0-9E823EE25138</string>
-					<string>85E9264C-5414-4FA0-AC07-F305A798ED46</string>
-					<string>B5893618-D07C-48F1-8867-736D0AAFF0E7</string>
-					<string>1354726C-DA64-4CA6-A099-26626A865D8D</string>
-					<string>4CC98A56-B60B-4A89-80E0-400C5314A050</string>
-					<string>869AB0B7-12DD-440A-905A-BFB1E0E16E1C</string>
-					<string>4611F02E-E9BF-11DC-8518-00112475D960</string>
-					<string>47FF50AF-E9BF-11DC-8518-00112475D960</string>
-					<string>EB47FBA1-AFB3-42F9-94A4-552D3175C17A</string>
-					<string>14BF0586-F2E8-4AB3-BB4B-E49099384403</string>
-					<string>5CE8838A-BF2C-497E-B87A-E90C3BC482E0</string>
-					<string>EC511A43-D3B7-11DC-BA49-00112475D960</string>
-					<string>B21BA16D-7C04-4912-8488-425CDCC332A8</string>
-					<string>CF506019-E964-4172-A3DA-475AE3B65558</string>
-					<string>5DAC28A7-33C8-4DA7-9E85-56618D6BEC9F</string>
-					<string>F5CBBE16-F5CC-4EDA-8BC6-30281BD7D854</string>
-					<string>F8316545-9AE4-4C7F-87ED-A2C00E6637FA</string>
-					<string>43680344-0818-42BF-95B4-58CD2D76545B</string>
-				</array>
-				<key>name</key>
-				<string>Validations</string>
-			</dict>
-			<key>8113246B-122E-4F4A-9B5A-98390900839E</key>
-			<dict>
-				<key>items</key>
-				<array>
-					<string>F60D0630-CBF5-4283-9D20-FA46C787A88D</string>
-					<string>1C491A76-751F-44EF-8DFB-0A585C7EEFF6</string>
-					<string>8B9CD068-4338-4039-AA06-D839A6C7A9FF</string>
-					<string>------------------------------------</string>
-					<string>2BD82DCB-1F19-4C8F-BC70-C0BBB06A2138</string>
-					<string>CD60F800-850D-47CF-BE32-3DE665DD5C68</string>
-					<string>D33EDCE7-F8AF-48D4-AA7A-852BBF03E31D</string>
-					<string>0249637E-0720-46DA-A8FD-E176A2CC458B</string>
-					<string>97021C0D-EB65-4046-B688-01F09B3B1615</string>
-					<string>4C92C020-7337-4D6E-91EE-7ABF2BFC7F41</string>
-					<string>------------------------------------</string>
-					<string>DBE14FE8-B415-4DBC-A316-F8DA63FE9FD7</string>
-					<string>------------------------------------</string>
-					<string>E0F281EC-5311-41F8-ADD9-2E2D059DA651</string>
-					<string>------------------------------------</string>
-					<string>FE9C4B4E-860D-49F0-AAF7-5582B98F5F54</string>
-				</array>
-				<key>name</key>
-				<string>Functional Tests</string>
-			</dict>
-			<key>88B6256D-A8BF-46A9-8A6B-651D089D5F67</key>
-			<dict>
-				<key>items</key>
-				<array>
-					<string>985F56D4-82ED-4C45-8250-2ECCFC71957E</string>
-					<string>07C696F8-79F5-4E0B-9EE9-03B693A54ABB</string>
-					<string>9A1AE6BA-8350-4AB7-B5BD-969A7E64CF29</string>
-					<string>CFDA9F62-D071-4E0F-AD10-66AE0729FFCF</string>
-					<string>------------------------------------</string>
-					<string>5EEA0C71-B34B-4408-953B-F47AAD343CCC</string>
-					<string>F758BFD1-00CA-4742-BE71-032580080F5C</string>
-					<string>------------------------------------</string>
-					<string>6DEF923E-2347-46EC-AFBE-183D08E63DC1</string>
-					<string>310C901C-EF32-4E88-938A-804ABBF8C428</string>
-					<string>6F2AB859-46E3-4FF5-A9A7-E9A813AB5DE1</string>
-				</array>
-				<key>name</key>
-				<string>Database</string>
-			</dict>
-			<key>8D802011-B3E5-4BC1-A3E1-5B78A2A49C28</key>
-			<dict>
-				<key>items</key>
-				<array>
-					<string>18C76913-061C-4D65-866D-67AA3724AFEF</string>
-					<string>7BC860E6-7561-4E6E-983B-507D7A6F6228</string>
-					<string>27A6C58A-896B-4956-BA81-D671A2EF9C7D</string>
-					<string>AC50762C-DE40-4EB9-9A22-2F6AF2EA4EA3</string>
-					<string>F03162DE-9DB6-417B-9DD7-52D9F11EA736</string>
-					<string>04A86178-71B1-430A-A06D-DFF7C9A338B5</string>
-					<string>16A705EB-10DC-42B5-9FF2-377E206421DC</string>
-				</array>
-				<key>name</key>
-				<string>Columns</string>
-			</dict>
-			<key>93964B1A-33AB-4B4F-A92C-5138402EDB7C</key>
-			<dict>
-				<key>items</key>
-				<array>
-					<string>9D4E30E2-4A61-4941-B9F3-BEE97552747A</string>
-				</array>
-				<key>name</key>
-				<string>Change columns t. drop-down list</string>
-			</dict>
-			<key>9EB71DE4-93D3-466C-B1D8-54892538FF3A</key>
-			<dict>
-				<key>items</key>
-				<array>
-					<string>62C3838B-0790-4FC2-8425-F273A57F5D33</string>
-					<string>78FCF992-D01B-404F-BC54-5EE7B91F999A</string>
-					<string>F1BE0C3D-7203-43E9-BEFB-D1A99CDD31C1</string>
-					<string>C12C98A5-74E5-4E70-9ADB-8783455D6539</string>
-				</array>
-				<key>name</key>
-				<string>Ajax Tests</string>
-			</dict>
-			<key>A1D9600C-4E0B-4ABF-9C0A-19AD7A168A15</key>
-			<dict>
-				<key>items</key>
-				<array>
-					<string>91C543BF-7BD8-4E3A-B493-AE572C5472A0</string>
-					<string>0FF86C46-0E01-4D03-8232-72CA5BD55706</string>
-					<string>2183A9A9-17ED-4A4F-ABB6-668EDDD3A6E4</string>
-					<string>BD4B90F7-2187-4E75-BFFB-77BE67CB8DAE</string>
-					<string>F3606586-F905-4A91-92CA-82319239221D</string>
-				</array>
-				<key>name</key>
-				<string>Routes</string>
-			</dict>
-			<key>A229B2F8-21B4-4910-AA61-6672A48C2991</key>
-			<dict>
-				<key>items</key>
-				<array>
-					<string>D975E5C1-42C2-40F1-8960-0DA533B18113</string>
-					<string>36E2A3EE-E9CC-4B7F-A4CF-AFAF970B8699</string>
-					<string>38D5CA05-E219-4399-A244-609AF40B1D0B</string>
-					<string>7053B86A-9B81-4154-AB3C-61B8035C5D33</string>
-					<string>35E95C81-22F7-4C40-8297-ED21086DDA81</string>
-					<string>7B15B396-1F41-4529-9253-32761E94448C</string>
-				</array>
-				<key>name</key>
-				<string>Logger</string>
-			</dict>
-			<key>A26B8A37-FAC0-4F44-B18D-6BE30D84F27E</key>
-			<dict>
-				<key>items</key>
-				<array>
-					<string>59CD3A41-8164-4FB4-B462-D7ACE86BCDBF</string>
-					<string>A017AB39-A875-40DC-8ACF-7E3551057CA0</string>
-					<string>FE430ECD-5D40-4D95-A73B-F064C73992DE</string>
-				</array>
-				<key>name</key>
-				<string>Finders</string>
-			</dict>
-			<key>A66D3FEE-D537-11DC-BD8E-00112475D960</key>
-			<dict>
-				<key>items</key>
-				<array>
-					<string>B757F7E5-E4BD-11DC-A11A-00112475D960</string>
-					<string>FFE7B820-E4BD-11DC-A11A-00112475D960</string>
-					<string>0E63B7D5-E4BE-11DC-A11A-00112475D960</string>
-					<string>1BDC463A-E4BE-11DC-A11A-00112475D960</string>
-					<string>26C09807-E4BE-11DC-A11A-00112475D960</string>
-					<string>3458B140-E4BE-11DC-A11A-00112475D960</string>
-					<string>49643690-E4BE-11DC-A11A-00112475D960</string>
-					<string>537BDD48-E4BE-11DC-A11A-00112475D960</string>
-					<string>61CF5B32-E4BE-11DC-A11A-00112475D960</string>
-					<string>6BE6F315-E4BE-11DC-A11A-00112475D960</string>
-					<string>7CE57C6C-E4BE-11DC-A11A-00112475D960</string>
-					<string>950B0BF2-E4BE-11DC-A11A-00112475D960</string>
-					<string>A677FFD4-E4BE-11DC-A11A-00112475D960</string>
-					<string>B6D9225C-E4BE-11DC-A11A-00112475D960</string>
-				</array>
-				<key>name</key>
-				<string>Create columns t. drop-down list</string>
-			</dict>
-			<key>AA879356-48FB-48A6-8BF3-0EF40A592691</key>
-			<dict>
-				<key>items</key>
-				<array>
-					<string>A909C4C3-8EFE-4E39-9D96-BA8F0ABE6085</string>
-					<string>AFE06B67-CE98-42A6-93D1-8EC8E3B9F83C</string>
-					<string>9D7228B3-A6ED-4598-B096-032B3600864F</string>
-					<string>EF527A27-D1D4-4FD8-BD23-71397881C29A</string>
-					<string>F2F3167C-73B9-11D9-B752-000D932CD5BA</string>
-					<string>2233B484-73BA-11D9-B752-000D932CD5BA</string>
-					<string>053490FE-73BA-11D9-B752-000D932CD5BA</string>
-					<string>0C137FBF-73BA-11D9-B752-000D932CD5BA</string>
-					<string>18D3C1C3-73BA-11D9-B752-000D932CD5BA</string>
-				</array>
-				<key>name</key>
-				<string>redirect_to</string>
-			</dict>
-			<key>B5104C6E-E4BF-11DC-A11A-00112475D960</key>
-			<dict>
-				<key>items</key>
-				<array>
-					<string>377BF814-D52D-11DC-BD8E-00112475D960</string>
-					<string>6A9D4C30-D52D-11DC-BD8E-00112475D960</string>
-					<string>729D559E-D52D-11DC-BD8E-00112475D960</string>
-					<string>8AF989C4-D52E-11DC-BD8E-00112475D960</string>
-					<string>93A16768-D52E-11DC-BD8E-00112475D960</string>
-					<string>D6CBCA96-D52F-11DC-BD8E-00112475D960</string>
-					<string>4600CE20-D532-11DC-BD8E-00112475D960</string>
-					<string>4F5DDD37-D532-11DC-BD8E-00112475D960</string>
-					<string>56276686-D532-11DC-BD8E-00112475D960</string>
-					<string>967093B4-D532-11DC-BD8E-00112475D960</string>
-					<string>5E9B8B0E-D532-11DC-BD8E-00112475D960</string>
-					<string>E0C8FDC4-D532-11DC-BD8E-00112475D960</string>
-					<string>FC2523C1-D532-11DC-BD8E-00112475D960</string>
-					<string>EDA6568B-D533-11DC-BD8E-00112475D960</string>
-				</array>
-				<key>name</key>
-				<string>Create columns helpers</string>
-			</dict>
-			<key>B89CD2E9-4271-41BB-8AF6-A747553D99EB</key>
-			<dict>
-				<key>items</key>
-				<array>
-					<string>B8F08BD7-6160-482C-8A3D-CBC6BD2079A4</string>
-					<string>2AC3AC1F-743B-4A33-863C-C37885073806</string>
-					<string>BD2E4045-54E6-450E-B31B-5E1865CFFBC9</string>
-					<string>F396B7BD-8255-48B1-904A-06E7D7CC2741</string>
-					<string>3E3AF538-171B-4108-AB92-827AD7E24C77</string>
-					<string>9D58B6C9-BA52-48B3-B639-D5CB894AF810</string>
-					<string>3E3AF538-171B-4108-AB92-827AD7E24C77</string>
-				</array>
-				<key>name</key>
-				<string>Associations</string>
-			</dict>
-			<key>BA9F12E8-9151-4975-8E8A-9644290E6038</key>
-			<dict>
-				<key>items</key>
-				<array>
-					<string>402C251E-595B-4A58-8EB9-41989040F280</string>
-					<string>CC1BCD1C-2479-4335-B511-17B880316A75</string>
-					<string>06498926-F84D-466C-8736-B8A0AC586A94</string>
-					<string>F579F9E7-E072-4BCC-BFF9-C8C5BAE7FFA5</string>
-					<string>A95358D2-C68A-4894-8C36-062C9F45848A</string>
-					<string>42289456-C8D1-498C-AE30-5206544B349F</string>
-					<string>5DBA8F72-DD6C-4CBF-83FD-76301E159BA9</string>
-					<string>79BC2303-3D9D-4E21-AF85-73B388B7B56D</string>
-					<string>C315EC5D-A7F3-49CB-9795-21B78BB42FF4</string>
-				</array>
-				<key>name</key>
-				<string>form_for f. drop-down list</string>
-			</dict>
-			<key>BAEAEAA9-ECE9-4B42-B3FA-8249EEFACB6C</key>
-			<dict>
-				<key>items</key>
-				<array>
-					<string>DF30226E-1111-448A-B669-7CA34EE83909</string>
-				</array>
-				<key>name</key>
-				<string>Change columns helpers</string>
-			</dict>
-			<key>CD88AD5A-7F20-4D4C-882A-31E1CDFDFD16</key>
-			<dict>
-				<key>items</key>
-				<array>
-					<string>A1776279-5396-4FE9-9218-8BF2C88C5271</string>
-					<string>E2CE2E3B-8A61-4866-9AF5-A12F44CF7233</string>
-					<string>86CFB156-E72B-440F-9C7D-08A3375C3ADB</string>
-					<string>44FBD811-70A9-462B-AC56-F975ADAD62AF</string>
-					<string>BA0DE6C7-EAD3-42C9-8ABB-2B9A5F2FE225</string>
-					<string>BCB25D36-2D3F-41E9-B2CF-37D6E883E8D1</string>
-					<string>523BE8A6-0845-493D-A9B6-532F73D21950</string>
-					<string>4D1787E3-1583-4CF3-8D99-CC45D7C35EED</string>
-					<string>D64D8863-DCB6-4397-B5B0-073E0AE04167</string>
-					<string>279D1981-B055-4693-B9AF-5B571A62A6AE</string>
-					<string>3F4B502B-5F68-4687-88E9-6EF3BDF9677D</string>
-					<string>0C9EA1A1-66C5-4E1C-9C30-E1FFE8EC6EAE</string>
-					<string>1C20EEBE-B4BA-48C8-9B33-7B5BB00D958C</string>
-					<string>A2F3E8C1-4216-4890-8491-2F8C7534ED03</string>
-				</array>
-				<key>name</key>
-				<string>Callbacks</string>
-			</dict>
-			<key>D4D18AD6-11DA-47F2-AAD8-F2F350EE2BB9</key>
-			<dict>
-				<key>items</key>
-				<array>
-					<string>0CCC8443-40F3-4BAB-9440-D737562B5F45</string>
-					<string>09BB96F2-75FD-48A7-8314-B5B56B09B477</string>
-					<string>------------------------------------</string>
-					<string>C7151BF3-7068-4344-9B09-86F3BF4A9C63</string>
-					<string>9453F0B3-B946-445F-BDB0-B01DE70732FC</string>
-					<string>EE862691-A624-4797-90CF-EDD39EFB2D8E</string>
-					<string>DFE393BE-0764-49FE-B464-6350A50921E6</string>
-					<string>51C9C27A-D931-49F9-B6D8-C0E7ABEC992D</string>
-					<string>B078346F-61D8-4E75-9427-80720FBC67F7</string>
-					<string>B207BBD4-D6AA-41E9-9530-27210F2D7B66</string>
-					<string>BDBB15A4-2824-4BEC-93A5-7475F9C46A39</string>
-					<string>638D94A4-BDFC-4FE9-8909-9934F3FD2899</string>
-				</array>
-				<key>name</key>
-				<string>Go To</string>
-			</dict>
-			<key>E34453D0-68EB-408C-AE49-990663DE18F7</key>
-			<dict>
-				<key>items</key>
-				<array>
-					<string>30BEA6FB-301C-4460-93EC-FA3404688962</string>
-					<string>5C6F4462-70E6-40B4-B3F2-F371656E7784</string>
-					<string>------------------------------------</string>
-				</array>
-				<key>name</key>
-				<string>Unit Tests</string>
-			</dict>
-			<key>E3C11C94-8472-45CC-9258-1E5EEC7657A8</key>
-			<dict>
-				<key>items</key>
-				<array>
-					<string>B31822D9-2048-4D16-B2AF-00E0B4E5C368</string>
-					<string>F46EE8EE-239C-46D7-980B-3F861B7D9111</string>
-					<string>4C898FA8-D09C-4B28-BE42-14BB4EA4E2B1</string>
-					<string>F0DB6886-4FFE-45BA-907F-44326AD8142D</string>
-					<string>D4282CE1-4171-4B13-9220-3F2718BC2505</string>
-					<string>3379FB35-C664-4255-96C6-6E4B91F12759</string>
-					<string>99FEFD9B-5A07-46E3-950D-5C474E42B695</string>
-					<string>C8BA285D-E12E-4AB8-A941-514C963E8226</string>
-					<string>3000E569-4E19-4566-B08E-A3FFFAAC9075</string>
-				</array>
-				<key>name</key>
-				<string>form_for helpers</string>
-			</dict>
-			<key>EE4BA904-F727-4C6B-A2CB-602E30537E38</key>
-			<dict>
-				<key>items</key>
-				<array>
-					<string>1DD8A214-1C97-45BA-ADEE-8F888DDE8570</string>
-					<string>------------------------------------</string>
-					<string>7D99041D-C3B7-4940-AE64-6B1758CDB47C</string>
-					<string>15BDD7B6-5C15-4684-93C7-A05E3D2221AC</string>
-					<string>BA9F12E8-9151-4975-8E8A-9644290E6038</string>
-					<string>E3C11C94-8472-45CC-9258-1E5EEC7657A8</string>
-					<string>------------------------------------</string>
-					<string>F0F6DACA-6A0B-11D9-BDC2-000D932CD5BA</string>
-					<string>D0E29200-E910-11DC-A399-00112475D960</string>
-					<string>9FB9848E-EA5A-11DC-9DE5-00112475D960</string>
-					<string>245AD020-669A-46E1-8123-4B9CFDF8075A</string>
-					<string>AC385ABF-96CD-4FCB-80AD-BF37D6EE79D2</string>
-					<string>------------------------------------</string>
-					<string>EC605540-C431-4FD0-AD91-D913118DACA7</string>
-					<string>------------------------------------</string>
-					<string>F7744F07-306C-4951-AB5A-3D69BA5516B7</string>
-				</array>
-				<key>name</key>
-				<string>ERb Templates</string>
-			</dict>
-			<key>F4DD75AA-A954-4FBE-A03F-28718335414E</key>
-			<dict>
-				<key>items</key>
-				<array>
-					<string>95F83E1D-5B03-424F-8BEC-8AF66C8939BC</string>
-					<string>A7F692C1-778A-48B8-945E-573568BA0403</string>
-					<string>33057A79-677B-4DFB-99D4-1492778BDDC6</string>
-				</array>
-				<key>name</key>
-				<string>Indexes</string>
-			</dict>
-		</dict>
-	</dict>
-	<key>name</key>
-	<string>Ruby on Rails</string>
-	<key>ordering</key>
-	<array>
-		<string>1970AE74-3949-40B3-B263-727AA3FF167A</string>
-		<string>0CCC8443-40F3-4BAB-9440-D737562B5F45</string>
-		<string>C7151BF3-7068-4344-9B09-86F3BF4A9C63</string>
-		<string>638D94A4-BDFC-4FE9-8909-9934F3FD2899</string>
-		<string>9453F0B3-B946-445F-BDB0-B01DE70732FC</string>
-		<string>EE862691-A624-4797-90CF-EDD39EFB2D8E</string>
-		<string>51C9C27A-D931-49F9-B6D8-C0E7ABEC992D</string>
-		<string>BDBB15A4-2824-4BEC-93A5-7475F9C46A39</string>
-		<string>DFE393BE-0764-49FE-B464-6350A50921E6</string>
-		<string>B078346F-61D8-4E75-9427-80720FBC67F7</string>
-		<string>B207BBD4-D6AA-41E9-9530-27210F2D7B66</string>
-		<string>09BB96F2-75FD-48A7-8314-B5B56B09B477</string>
-		<string>1DD8A214-1C97-45BA-ADEE-8F888DDE8570</string>
-		<string>4904EDC7-5ED3-4132-AAB2-C2AD87C97EFE</string>
-		<string>D696FA2C-785A-4B73-A2F6-F750904DD7C2</string>
-		<string>46ECE243-0448-4A64-A223-27CC21E7704D</string>
-		<string>985F56D4-82ED-4C45-8250-2ECCFC71957E</string>
-		<string>CFDA9F62-D071-4E0F-AD10-66AE0729FFCF</string>
-		<string>07C696F8-79F5-4E0B-9EE9-03B693A54ABB</string>
-		<string>9A1AE6BA-8350-4AB7-B5BD-969A7E64CF29</string>
-		<string>5EEA0C71-B34B-4408-953B-F47AAD343CCC</string>
-		<string>F758BFD1-00CA-4742-BE71-032580080F5C</string>
-		<string>DC549A45-D9B0-11DC-94E9-00112475D960</string>
-		<string>190401C2-D9B1-11DC-94E9-00112475D960</string>
-		<string>2C60CBA1-D9B1-11DC-94E9-00112475D960</string>
-		<string>F4EA552D-D9B0-11DC-94E9-00112475D960</string>
-		<string>04A30A4D-D9B1-11DC-94E9-00112475D960</string>
-		<string>0D966168-D9B1-11DC-94E9-00112475D960</string>
-		<string>212C3047-D9B1-11DC-94E9-00112475D960</string>
-		<string>0BCF0EE2-35EE-4959-A771-E74D55271D5A</string>
-		<string>275C0B86-F735-49B6-8A22-218A8F4CC2E0</string>
-		<string>310C901C-EF32-4E88-938A-804ABBF8C428</string>
-		<string>6DEF923E-2347-46EC-AFBE-183D08E63DC1</string>
-		<string>6F2AB859-46E3-4FF5-A9A7-E9A813AB5DE1</string>
-		<string>964436B8-E578-11DC-8177-00112475D960</string>
-		<string>25F8F5D8-2BD1-45D8-8B2A-9F2EA4F73AA2</string>
-		<string>20FC02C5-32A3-4F20-B163-FF75C9FDFABF</string>
-		<string>A2135370-67A1-488D-B43C-B4F221127C2F</string>
-		<string>18C76913-061C-4D65-866D-67AA3724AFEF</string>
-		<string>7BC860E6-7561-4E6E-983B-507D7A6F6228</string>
-		<string>27A6C58A-896B-4956-BA81-D671A2EF9C7D</string>
-		<string>809BCA42-5C49-4B08-B3C4-BB773036C086</string>
-		<string>AC50762C-DE40-4EB9-9A22-2F6AF2EA4EA3</string>
-		<string>F03162DE-9DB6-417B-9DD7-52D9F11EA736</string>
-		<string>04A86178-71B1-430A-A06D-DFF7C9A338B5</string>
-		<string>FD8CC811-2AD3-480F-B975-DF959DC96C67</string>
-		<string>95F83E1D-5B03-424F-8BEC-8AF66C8939BC</string>
-		<string>33057A79-677B-4DFB-99D4-1492778BDDC6</string>
-		<string>A7F692C1-778A-48B8-945E-573568BA0403</string>
-		<string>4B3F798E-E3B6-48C8-8C2F-CB8631011638</string>
-		<string>EC605540-C431-4FD0-AD91-D913118DACA7</string>
-		<string>AC8EDA3E-875B-11D9-897C-000393CBCE2E</string>
-		<string>7B02ABF8-8763-11D9-897C-000393CBCE2E</string>
-		<string>D864896E-8763-11D9-897C-000393CBCE2E</string>
-		<string>A909C4C3-8EFE-4E39-9D96-BA8F0ABE6085</string>
-		<string>AFE06B67-CE98-42A6-93D1-8EC8E3B9F83C</string>
-		<string>9D7228B3-A6ED-4598-B096-032B3600864F</string>
-		<string>EF527A27-D1D4-4FD8-BD23-71397881C29A</string>
-		<string>F2F3167C-73B9-11D9-B752-000D932CD5BA</string>
-		<string>2233B484-73BA-11D9-B752-000D932CD5BA</string>
-		<string>053490FE-73BA-11D9-B752-000D932CD5BA</string>
-		<string>0C137FBF-73BA-11D9-B752-000D932CD5BA</string>
-		<string>18D3C1C3-73BA-11D9-B752-000D932CD5BA</string>
-		<string>7BBD3F57-57A5-4CD0-8E79-B931021FC110</string>
-		<string>9ECBF20C-003E-41D9-A881-4BAC0656F9DC</string>
-		<string>7D99041D-C3B7-4940-AE64-6B1758CDB47C</string>
-		<string>15BDD7B6-5C15-4684-93C7-A05E3D2221AC</string>
-		<string>402C251E-595B-4A58-8EB9-41989040F280</string>
-		<string>B31822D9-2048-4D16-B2AF-00E0B4E5C368</string>
-		<string>CC1BCD1C-2479-4335-B511-17B880316A75</string>
-		<string>F46EE8EE-239C-46D7-980B-3F861B7D9111</string>
-		<string>06498926-F84D-466C-8736-B8A0AC586A94</string>
-		<string>4C898FA8-D09C-4B28-BE42-14BB4EA4E2B1</string>
-		<string>F579F9E7-E072-4BCC-BFF9-C8C5BAE7FFA5</string>
-		<string>F0DB6886-4FFE-45BA-907F-44326AD8142D</string>
-		<string>A95358D2-C68A-4894-8C36-062C9F45848A</string>
-		<string>D4282CE1-4171-4B13-9220-3F2718BC2505</string>
-		<string>42289456-C8D1-498C-AE30-5206544B349F</string>
-		<string>3379FB35-C664-4255-96C6-6E4B91F12759</string>
-		<string>5DBA8F72-DD6C-4CBF-83FD-76301E159BA9</string>
-		<string>99FEFD9B-5A07-46E3-950D-5C474E42B695</string>
-		<string>79BC2303-3D9D-4E21-AF85-73B388B7B56D</string>
-		<string>C8BA285D-E12E-4AB8-A941-514C963E8226</string>
-		<string>C315EC5D-A7F3-49CB-9795-21B78BB42FF4</string>
-		<string>3000E569-4E19-4566-B08E-A3FFFAAC9075</string>
-		<string>F0F6DACA-6A0B-11D9-BDC2-000D932CD5BA</string>
-		<string>D0E29200-E910-11DC-A399-00112475D960</string>
-		<string>9FB9848E-EA5A-11DC-9DE5-00112475D960</string>
-		<string>326B57A7-B4A9-447B-A3D2-0EA74158E1E1</string>
-		<string>6BA737F0-63D1-4D82-9381-4331E18B12C5</string>
-		<string>750DEEF9-18A0-40FC-8E54-574CE5EE5565</string>
-		<string>866AAD87-E458-4F2D-9E7C-3CE73EFC047B</string>
-		<string>9E2B42FE-7BC8-11D9-906A-000D932CD5BA</string>
-		<string>B4F952F4-7BC8-11D9-906A-000D932CD5BA</string>
-		<string>74590E16-7BCB-11D9-906A-000D932CD5BA</string>
-		<string>C11C0BF5-7BC8-11D9-906A-000D932CD5BA</string>
-		<string>D21BE958-7BC8-11D9-906A-000D932CD5BA</string>
-		<string>E5E08AA0-4EDD-4583-BF07-5D6C49E98410</string>
-		<string>F7744F07-306C-4951-AB5A-3D69BA5516B7</string>
-		<string>AC385ABF-96CD-4FCB-80AD-BF37D6EE79D2</string>
-		<string>2A8FBE48-E196-4019-AE76-BF3ED4B54F47</string>
-		<string>1E5DE984-510C-4992-8AD5-C5FA6D7F2A88</string>
-		<string>053F1D6A-B413-43FF-B697-E3120FD0489F</string>
-		<string>7B03D38B-7580-41AC-BC2B-3766AB074A43</string>
-		<string>97C0992D-715F-4322-A3E0-DD4D2B7E2FC2</string>
-		<string>3F83272F-62D5-4BCB-BAA3-806083078829</string>
-		<string>498168A5-5AF8-4F59-8A2D-B517FAB98CDB</string>
-		<string>BFAAC8DA-A043-4684-967B-B3E5DAE08C62</string>
-		<string>046FB1B6-9C65-4702-91EC-4AA9878CD949</string>
-		<string>6F41AFFD-B3A7-42D0-8A84-D6086C118D92</string>
-		<string>CBB06A4E-3A82-45F3-91AA-259F02314B9D</string>
-		<string>A3B09AFE-40B5-4623-8B85-E9F369ECE22D</string>
-		<string>4F636977-F7A6-4BF5-B09B-7F087683C3B9</string>
-		<string>AC8A995F-0034-433C-905D-E5C1F29D6EFF</string>
-		<string>7D43B0EA-2C3C-499B-9346-A8E48CBF29CD</string>
-		<string>724A68C1-A727-46FF-AF59-288E26B09629</string>
-		<string>A8AF8B90-94E8-42E1-8057-DDBA57809F6A</string>
-		<string>64E93A71-6E62-48D9-9694-123080AE6723</string>
-		<string>67C5082F-5011-434A-8EAA-6B8D3600935F</string>
-		<string>ECB10C0B-E8B7-4606-ABF5-4A2A26E5AB1A</string>
-		<string>54F61419-001F-4B71-83AC-8DC633694AF0</string>
-		<string>3BDD0D52-443E-4F5F-AE09-ABCC2ABE9A42</string>
-		<string>B41D3164-EA53-4DDC-850E-27B82B24061F</string>
-		<string>3F26FDB4-ACF9-4856-9312-6A4D78DC8564</string>
-		<string>91C543BF-7BD8-4E3A-B493-AE572C5472A0</string>
-		<string>0FF86C46-0E01-4D03-8232-72CA5BD55706</string>
-		<string>2183A9A9-17ED-4A4F-ABB6-668EDDD3A6E4</string>
-		<string>BD4B90F7-2187-4E75-BFFB-77BE67CB8DAE</string>
-		<string>F3606586-F905-4A91-92CA-82319239221D</string>
-		<string>16A705EB-10DC-42B5-9FF2-377E206421DC</string>
-		<string>7592CA99-75D7-48B6-9133-00B9F148FF43</string>
-		<string>67FD2F8F-5F25-45F2-A451-2F39977A9EDE</string>
-		<string>377BF814-D52D-11DC-BD8E-00112475D960</string>
-		<string>B757F7E5-E4BD-11DC-A11A-00112475D960</string>
-		<string>6A9D4C30-D52D-11DC-BD8E-00112475D960</string>
-		<string>FFE7B820-E4BD-11DC-A11A-00112475D960</string>
-		<string>729D559E-D52D-11DC-BD8E-00112475D960</string>
-		<string>0E63B7D5-E4BE-11DC-A11A-00112475D960</string>
-		<string>8AF989C4-D52E-11DC-BD8E-00112475D960</string>
-		<string>1BDC463A-E4BE-11DC-A11A-00112475D960</string>
-		<string>93A16768-D52E-11DC-BD8E-00112475D960</string>
-		<string>26C09807-E4BE-11DC-A11A-00112475D960</string>
-		<string>D6CBCA96-D52F-11DC-BD8E-00112475D960</string>
-		<string>3458B140-E4BE-11DC-A11A-00112475D960</string>
-		<string>4600CE20-D532-11DC-BD8E-00112475D960</string>
-		<string>49643690-E4BE-11DC-A11A-00112475D960</string>
-		<string>4F5DDD37-D532-11DC-BD8E-00112475D960</string>
-		<string>537BDD48-E4BE-11DC-A11A-00112475D960</string>
-		<string>56276686-D532-11DC-BD8E-00112475D960</string>
-		<string>61CF5B32-E4BE-11DC-A11A-00112475D960</string>
-		<string>967093B4-D532-11DC-BD8E-00112475D960</string>
-		<string>6BE6F315-E4BE-11DC-A11A-00112475D960</string>
-		<string>5E9B8B0E-D532-11DC-BD8E-00112475D960</string>
-		<string>7CE57C6C-E4BE-11DC-A11A-00112475D960</string>
-		<string>E0C8FDC4-D532-11DC-BD8E-00112475D960</string>
-		<string>950B0BF2-E4BE-11DC-A11A-00112475D960</string>
-		<string>FC2523C1-D532-11DC-BD8E-00112475D960</string>
-		<string>A677FFD4-E4BE-11DC-A11A-00112475D960</string>
-		<string>EDA6568B-D533-11DC-BD8E-00112475D960</string>
-		<string>B6D9225C-E4BE-11DC-A11A-00112475D960</string>
-		<string>DF30226E-1111-448A-B669-7CA34EE83909</string>
-		<string>9D4E30E2-4A61-4941-B9F3-BEE97552747A</string>
-		<string>20375601-B13F-4314-B8E4-362706566636</string>
-		<string>F60D0630-CBF5-4283-9D20-FA46C787A88D</string>
-		<string>FE9C4B4E-860D-49F0-AAF7-5582B98F5F54</string>
-		<string>2BD82DCB-1F19-4C8F-BC70-C0BBB06A2138</string>
-		<string>CD60F800-850D-47CF-BE32-3DE665DD5C68</string>
-		<string>D33EDCE7-F8AF-48D4-AA7A-852BBF03E31D</string>
-		<string>0249637E-0720-46DA-A8FD-E176A2CC458B</string>
-		<string>97021C0D-EB65-4046-B688-01F09B3B1615</string>
-		<string>4C92C020-7337-4D6E-91EE-7ABF2BFC7F41</string>
-		<string>30BEA6FB-301C-4460-93EC-FA3404688962</string>
-		<string>5C6F4462-70E6-40B4-B3F2-F371656E7784</string>
-		<string>DBE14FE8-B415-4DBC-A316-F8DA63FE9FD7</string>
-		<string>1C491A76-751F-44EF-8DFB-0A585C7EEFF6</string>
-		<string>8B9CD068-4338-4039-AA06-D839A6C7A9FF</string>
-		<string>B8F08BD7-6160-482C-8A3D-CBC6BD2079A4</string>
-		<string>2AC3AC1F-743B-4A33-863C-C37885073806</string>
-		<string>BD2E4045-54E6-450E-B31B-5E1865CFFBC9</string>
-		<string>F396B7BD-8255-48B1-904A-06E7D7CC2741</string>
-		<string>3E3AF538-171B-4108-AB92-827AD7E24C77</string>
-		<string>9D58B6C9-BA52-48B3-B639-D5CB894AF810</string>
-		<string>89198999-7E6D-4D97-A20E-45263E1CA993</string>
-		<string>A2477223-AD5A-4723-8052-943CE9BA634D</string>
-		<string>47944705-F605-4ED4-B4C0-9E823EE25138</string>
-		<string>85E9264C-5414-4FA0-AC07-F305A798ED46</string>
-		<string>B5893618-D07C-48F1-8867-736D0AAFF0E7</string>
-		<string>1354726C-DA64-4CA6-A099-26626A865D8D</string>
-		<string>4CC98A56-B60B-4A89-80E0-400C5314A050</string>
-		<string>869AB0B7-12DD-440A-905A-BFB1E0E16E1C</string>
-		<string>4611F02E-E9BF-11DC-8518-00112475D960</string>
-		<string>47FF50AF-E9BF-11DC-8518-00112475D960</string>
-		<string>EB47FBA1-AFB3-42F9-94A4-552D3175C17A</string>
-		<string>14BF0586-F2E8-4AB3-BB4B-E49099384403</string>
-		<string>B21BA16D-7C04-4912-8488-425CDCC332A8</string>
-		<string>CF506019-E964-4172-A3DA-475AE3B65558</string>
-		<string>5DAC28A7-33C8-4DA7-9E85-56618D6BEC9F</string>
-		<string>F5CBBE16-F5CC-4EDA-8BC6-30281BD7D854</string>
-		<string>5CE8838A-BF2C-497E-B87A-E90C3BC482E0</string>
-		<string>A1776279-5396-4FE9-9218-8BF2C88C5271</string>
-		<string>E2CE2E3B-8A61-4866-9AF5-A12F44CF7233</string>
-		<string>86CFB156-E72B-440F-9C7D-08A3375C3ADB</string>
-		<string>44FBD811-70A9-462B-AC56-F975ADAD62AF</string>
-		<string>BA0DE6C7-EAD3-42C9-8ABB-2B9A5F2FE225</string>
-		<string>BCB25D36-2D3F-41E9-B2CF-37D6E883E8D1</string>
-		<string>523BE8A6-0845-493D-A9B6-532F73D21950</string>
-		<string>3F4B502B-5F68-4687-88E9-6EF3BDF9677D</string>
-		<string>1C20EEBE-B4BA-48C8-9B33-7B5BB00D958C</string>
-		<string>D64D8863-DCB6-4397-B5B0-073E0AE04167</string>
-		<string>279D1981-B055-4693-B9AF-5B571A62A6AE</string>
-		<string>0C9EA1A1-66C5-4E1C-9C30-E1FFE8EC6EAE</string>
-		<string>4D1787E3-1583-4CF3-8D99-CC45D7C35EED</string>
-		<string>A2F3E8C1-4216-4890-8491-2F8C7534ED03</string>
-		<string>EC511A43-D3B7-11DC-BA49-00112475D960</string>
-		<string>F8316545-9AE4-4C7F-87ED-A2C00E6637FA</string>
-		<string>43680344-0818-42BF-95B4-58CD2D76545B</string>
-		<string>A017AB39-A875-40DC-8ACF-7E3551057CA0</string>
-		<string>FE430ECD-5D40-4D95-A73B-F064C73992DE</string>
-		<string>59CD3A41-8164-4FB4-B462-D7ACE86BCDBF</string>
-		<string>1CB65A0D-4FEC-4438-9B4F-8B0BD13FB875</string>
-		<string>4E286CB4-069E-474C-A970-95216FE7DE95</string>
-		<string>D975E5C1-42C2-40F1-8960-0DA533B18113</string>
-		<string>36E2A3EE-E9CC-4B7F-A4CF-AFAF970B8699</string>
-		<string>38D5CA05-E219-4399-A244-609AF40B1D0B</string>
-		<string>7053B86A-9B81-4154-AB3C-61B8035C5D33</string>
-		<string>35E95C81-22F7-4C40-8297-ED21086DDA81</string>
-		<string>7B15B396-1F41-4529-9253-32761E94448C</string>
-		<string>786980D8-FA69-4542-85A3-5E48CFAA6814</string>
-		<string>9671EB7A-89D6-4C23-914F-88CBEE0D177A</string>
-		<string>E0F281EC-5311-41F8-ADD9-2E2D059DA651</string>
-		<string>F57522B2-9F5F-4DF9-AE46-9478AF019C63</string>
-		<string>B25B7560-FACB-4A9E-A226-B71C796BD1F3</string>
-		<string>FEF49C86-9386-405E-A191-684D1C963E3A</string>
-		<string>980C7667-9D60-49FF-AF74-A7B19B379F45</string>
-		<string>390A447F-0FA3-4F01-A10C-4F35675E0A43</string>
-		<string>62BEA590-F4EF-4001-B661-764EDFB92811</string>
-		<string>273E5E76-8D13-4476-9C38-8AF87432CB96</string>
-		<string>8B914165-9C66-4FA3-9AD6-1DA41B25F8F1</string>
-		<string>5ACBF49D-B5A5-495C-89D8-18AA740D9D02</string>
-		<string>028DA0A4-B310-4BEF-8643-2A22993C21C7</string>
-		<string>CFDC27A3-58CF-4198-8F93-36360978F0D0</string>
-		<string>D2783155-23F3-4B90-A317-5BD139471193</string>
-		<string>F1BE0C3D-7203-43E9-BEFB-D1A99CDD31C1</string>
-		<string>78FCF992-D01B-404F-BC54-5EE7B91F999A</string>
-		<string>62C3838B-0790-4FC2-8425-F273A57F5D33</string>
-		<string>C12C98A5-74E5-4E70-9ADB-8783455D6539</string>
-		<string>45D7E1FC-7D0B-4105-A1A2-3D10BB555A5C</string>
-		<string>54D6E91E-8F31-11D9-90C5-0011242E4184</string>
-		<string>4A3E6DA7-67A3-45B1-9EE0-ECFF9C7FA6C0</string>
-		<string>A6AE60CD-18CA-4474-BE7A-5255BC3EF083</string>
-		<string>D54FBDED-5481-4CC7-B75F-66465A499882</string>
-		<string>87EF33FE-E918-11DC-A399-00112475D960</string>
-		<string>C0FD2646-E924-11DC-A399-00112475D960</string>
-		<string>56151E60-589F-4CE7-8062-3E087732E2F1</string>
-	</array>
-	<key>uuid</key>
-	<string>467A60E0-6227-11D9-BFB1-000D93589AF6</string>
-</dict>
-</plist>
diff --git a/bundles/ruby-on-rails.tmbundle/script/clean_bundle_file_names b/bundles/ruby-on-rails.tmbundle/script/clean_bundle_file_names
deleted file mode 100755
index 87a9f2494..000000000
--- a/bundles/ruby-on-rails.tmbundle/script/clean_bundle_file_names
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/usr/bin/env ruby
-
-# To be run against files in this bundle to remove any
-# non-OS agnostic characters (see BADCHARS list)
-# AIM: ease the pain of access to this bundle by WinOS
-# machines, for E Text Editor etc.
-
-require 'uri'
-require 'find'
-require 'fileutils'
-include FileUtils::Verbose
-
-DIR_TO_CLEAN = File.expand_path(File.dirname(__FILE__) + "/../")
-BADCHARS = /([<>\|:\*…\"\?\\“”↵—↓↵‘’¬])/
-
-def sanitize(f)
-	URI.escape(f, BADCHARS).chomp
-end
-
-def verbose_rename (orig_name, new_name)
-  File.rename(orig_name, new_name)
-  puts orig_name + " --> " + new_name
-end
-
-# Sanitize the transit dir
-bad_dirs = []
-Find.find(DIR_TO_CLEAN) do |f|
-  f = File.expand_path(f).sub(DIR_TO_CLEAN, '')
-  next if f =~ /\/?\.(git|svn)/
-  orig_name = File.basename(f)
-  next if orig_name === ( clean_name = sanitize(File.basename(f)) )
-  if File.directory? f
-		bad_dirs.push(f)
-		next
-	end
-  dirname = File.dirname(f) + "/"
-  verbose_rename(dirname + orig_name, dirname + clean_name) unless (orig_name === clean_name)
-end
-
-puts "Renaming #{bad_dirs.size} dirs..."
-bad_dirs.each do |d|
-	orig_name = File.basename(d)
-	clean_name = sanitize(File.basename(d))
-	dirname = File.dirname(d) + "/"
-	verbose_rename(dirname + orig_name, dirname + clean_name)
-end
diff --git a/bundles/ruby-on-rails.tmbundle/script/destroy b/bundles/ruby-on-rails.tmbundle/script/destroy
deleted file mode 100755
index 2216b5e10..000000000
--- a/bundles/ruby-on-rails.tmbundle/script/destroy
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-APP_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-
-begin
-  require 'rubigen'
-rescue LoadError
-  require 'rubygems'
-  require 'rubigen'
-end
-require 'rubigen/scripts/destroy'
-
-ARGV.shift if ['--help', '-h'].include?(ARGV[0])
-RubiGen::Base.use_component_sources! [:newjs, :newjs_theme, :test_unit]
-RubiGen::Scripts::Destroy.new.run(ARGV)
diff --git a/bundles/ruby-on-rails.tmbundle/script/generate b/bundles/ruby-on-rails.tmbundle/script/generate
deleted file mode 100755
index bf33992a8..000000000
--- a/bundles/ruby-on-rails.tmbundle/script/generate
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-APP_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-
-begin
-  require 'rubigen'
-rescue LoadError
-  require 'rubygems'
-  require 'rubigen'
-end
-require 'rubigen/scripts/generate'
-
-ARGV.shift if ['--help', '-h'].include?(ARGV[0])
-RubiGen::Base.use_component_sources! [:newjs, :newjs_theme, :test_unit]
-RubiGen::Scripts::Generate.new.run(ARGV)
diff --git a/bundles/ruby-on-rails.tmbundle/script/txt2html b/bundles/ruby-on-rails.tmbundle/script/txt2html
deleted file mode 100755
index 2d2b9282f..000000000
--- a/bundles/ruby-on-rails.tmbundle/script/txt2html
+++ /dev/null
@@ -1,97 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'erb'
-require 'rubygems'
-begin
-  require 'newgem'
-rescue LoadError
-  puts "\n\nGenerating the website requires the newgem RubyGem"
-  puts "Install: gem install newgem\n\n"
-  exit(1)
-end
-require 'redcloth'
-require 'syntax/convertors/html'
-require 'erb'
-ENV['rakefile_just_config'] = "true"
-load File.dirname(__FILE__) + '/../Rakefile'
-
-version  = APP_VERSION
-download = 'http://railsbundle.com/dist/JavaScript Unit Testing.tar.gz'
-
-class Fixnum
-  def ordinal
-    # teens
-    return 'th' if (10..19).include?(self % 100)
-    # others
-    case self % 10
-    when 1: return 'st'
-    when 2: return 'nd'
-    when 3: return 'rd'
-    else    return 'th'
-    end
-  end
-end
-
-class Time
-  def pretty
-    return "#{mday}#{mday.ordinal} #{strftime('%B')} #{year}"
-  end
-end
-
-def convert_syntax(syntax, source)
-  return Syntax::Convertors::HTML.for_syntax(syntax).convert(source).gsub(%r!^<pre>|</pre>$!,'')
-end
-
-if ARGV.length >= 1
-  src, template = ARGV
-  template ||= File.join(File.dirname(__FILE__), '/../website/template.html.erb')
-
-else
-  puts("Usage: #{File.split($0).last} source.txt [template.html.erb] > output.html")
-  exit!
-end
-
-template = ERB.new(File.open(template).read)
-
-title = nil
-body = nil
-File.open(src) do |fsrc|
-  title_text = fsrc.readline
-  body_text = fsrc.read
-  syntax_items = []
-  body_text.gsub!(%r!<(pre|code)[^>]*?syntax=['"]([^'"]+)[^>]*>(.*?)</\1>!m){
-    ident = syntax_items.length
-    element, syntax, source = $1, $2, $3
-    syntax_items << "<#{element} class='syntax'>#{convert_syntax(syntax, source)}</#{element}>"
-    "syntax-temp-#{ident}"
-  }                
-  
-  # a few extra supported markup commands specifically for documenting tm bundles
-  [
-    ['COMMAND', '&#x2318;'],         
-    ['TAB', '&#x21E5;'],
-    ['SHIFT', '&#x21E7;'],
-    ['OPTION', '&#x2325;'],
-    ['CONTROL', '&#x2303;'],
-    ['BACKSPACE', '&#x232B;'],
-    ['DELETE', '&#x2326;'],
-    ['RETURN', '&#x21A9;'],
-    ['ENTER', '&#x2305;'],
-    ['ESCAPE', '&#x238B;'],
-    ['DOWN', '&#x2193;'],
-    ['UP', '&#x2191;'],
-    ['LEFT', '&#x2190;'],
-    ['RIGHT', '&#x2192;']    
-  ].map do |regexp, replacement|
-    body_text.gsub!(Regexp.new(regexp), replacement)
-  end 
-  
-  title = RedCloth.new(title_text).to_html.gsub(%r!<.*?>!,'').strip
-  body = RedCloth.new(body_text).to_html
-  body.gsub!(%r!(?:<pre><code>)?syntax-temp-(\d+)(?:</code></pre>)?!){ syntax_items[$1.to_i] }
-end
-stat = File.stat(src)
-created = stat.ctime
-modified = stat.mtime
-
-$stdout << template.result(binding)
diff --git a/bundles/ruby-on-rails.tmbundle/tasks/dist.rake b/bundles/ruby-on-rails.tmbundle/tasks/dist.rake
deleted file mode 100644
index 1dd5ce1ca..000000000
--- a/bundles/ruby-on-rails.tmbundle/tasks/dist.rake
+++ /dev/null
@@ -1,9 +0,0 @@
-desc "Build bundle archive for distribution"
-task :dist do
-  bundle = 'Ruby\ on\ Rails.tmbundle'
-  bundle_src = APP_ROOT
-  bundle_dist = "website/dist"
-  FileUtils.mkdir_p bundle_dist
-  bundle_file = "#{bundle_dist}/#{bundle}.tar.gz"
-  sh %{tar zcvf #{bundle_file}  --exclude .git --exclude #{bundle_file} .}
-end
\ No newline at end of file
diff --git a/bundles/ruby-on-rails.tmbundle/tasks/website.rake b/bundles/ruby-on-rails.tmbundle/tasks/website.rake
deleted file mode 100644
index 4312e9da0..000000000
--- a/bundles/ruby-on-rails.tmbundle/tasks/website.rake
+++ /dev/null
@@ -1,35 +0,0 @@
-require 'yaml'
-
-def website_config
-  unless @website_config
-    begin
-      @website_config = YAML.load(File.read(File.expand_path(File.dirname(__FILE__) + "/../config/website.yml")))
-    rescue
-      puts <<-EOS
-To upload your website to a host, you need to configure
-config/website.yml. See config/website.yml.sample for 
-an example.
-EOS
-      exit
-    end
-  end
-  @website_config
-end
-
-desc 'Generate website files'
-task :website_generate => :dist do
-  (Dir['website/**/*.txt'] - Dir['website/version*.txt']).each do |txt|
-    sh %{ #{RUBY_APP} script/txt2html #{txt} > #{txt.gsub(/txt$/,'html')} }
-  end
-end
-
-desc 'Upload website files to rubyforge'
-task :website_upload do
-  host        = website_config["host"] # "#{rubyforge_username}@rubyforge.org"
-  remote_dir  = website_config["remote_dir"] # "/var/www/gforge-projects/#{PATH}/"
-  local_dir   = 'website'
-  sh %{rsync -aCv #{local_dir}/ #{host}:#{remote_dir}}
-end
-
-desc 'Generate and upload website files'
-task :website => [:website_generate, :website_upload]
diff --git a/bundles/ruby-on-rails.tmbundle/website/demo.html b/bundles/ruby-on-rails.tmbundle/website/demo.html
deleted file mode 100644
index ddd7df1be..000000000
--- a/bundles/ruby-on-rails.tmbundle/website/demo.html
+++ /dev/null
@@ -1,1016 +0,0 @@
-<!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>
-  <link rel="stylesheet" href="stylesheets/screen.css" type="text/css" media="screen" />
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-  <title>
-      Step-by-step demonstration
-  </title>
-  <script src="javascripts/rounded_corners_lite.inc.js" type="text/javascript"></script>
-
-  <script type="text/javascript">
-    window.onload = function() {
-      settings = {
-          tl: { radius: 10 },
-          tr: { radius: 10 },
-          bl: { radius: 10 },
-          br: { radius: 10 },
-          antiAlias: true,
-          autoPad: true,
-          validTags: ["div"]
-      }
-      var versionBox = new curvyCorners(settings, document.getElementById("version"));
-      versionBox.applyCornersToAll();
-    }
-  </script>
-</head>
-<body>
-<div id="main">
-	
-    <h1>Step-by-step demonstration</h1>
-    <div id="version" class="clickable" onclick='document.location = "http://railsbundle.com/dist/JavaScript Unit Testing.tar.gz"; return false'>
-      <p>Get Version</p>
-      <a href="http://railsbundle.com/dist/JavaScript Unit Testing.tar.gz" class="numbers">2.0.0</a>
-      <a href="http://railsbundle.com/dist/JavaScript Unit Testing.tar.gz" class="numbers"><img src="images/logo_bundle.png" width="50" height="51" alt="Logo Bundle" border=0></a>
-    </div>
-    <p>In this demo we&#8217;ll create a blog; because that&#8217;s what blogs are for: being
-demonstrations of web frameworks.</p>
-
-
-	<p>The demonstration uses new features of Rails 2.0 and the snippets in this bundle.</p>
-
-
-	<h2>A New App</h2>
-
-
-<pre>rails blog
-cd blog
-mate .</pre>
-
-	<h2>Add some models</h2>
-
-
-<pre>ruby script/generate model Post subject:string body:text</pre>
-
-	<p>This creates a 001_create_posts migration with a create_table:</p>
-
-
-	<p><pre class='syntax'><span class="ident">create_table</span> <span class="symbol">:posts</span> <span class="keyword">do</span> <span class="punct">|</span><span class="ident">t</span><span class="punct">|</span>
-  <span class="ident">t</span><span class="punct">.</span><span class="ident">string</span> <span class="symbol">:subject</span>
-  <span class="ident">t</span><span class="punct">.</span><span class="ident">text</span> <span class="symbol">:body</span>
-
-  <span class="ident">t</span><span class="punct">.</span><span class="ident">timestamps</span>
-<span class="keyword">end</span></pre></p>
-
-
-	<h2>Sexy Migration support</h2>
-
-
-	<p>If you put the cursor on the line after <code>t.text :body</code>, type <code>t.</code> and press &#x21E5;. Select &#8220;Create boolean column&#8221; (by pressing 0), and type &#8220;published&#8221; into the template field. If nothing happened when you pressed &#x21E5;, check that when you opened the migrations file you&#8217;ve selected the bundle &#8220;Ruby on Rails&#8221;.</p>
-
-
-	<p>Note that another <code>t.</code> was created on the next line! Press &#x21E5; and the cursor will be placed after it. You can now press &#x21E5; again to create another column, or delete this line.</p>
-
-
-	<p>Here, delete the extraneous <code>t.</code> line (&#x2303; &#x21E7; K). And save the file (&#x2318; S).</p>
-
-
-	<p>Run the migrations, either from the prompt:</p>
-
-
-	<pre><code>rake db:migrate</code></pre>
-
-
-	<p>or directly from the editor with &#x2303; | (Ctrl-Pipeline), and choosing option &#8220;Migrate to Current&#8221;.</p>
-
-
-	<h2>Post fixtures</h2>
-
-
-	<p>Update the <code>test/fixtures/posts.yml</code> file as:</p>
-
-
-	<p><pre class='syntax'><span class="key">published</span><span class="punct">:</span>
-  <span class="key">subject</span><span class="punct">:</span> Some article
-  <span class="key">body</span><span class="punct">:</span> A test article
-  <span class="key">published</span><span class="punct">:</span> true
-
-<span class="key">nonpublished</span><span class="punct">:</span>
-  <span class="key">body</span><span class="punct">:</span> Still writing this one</pre></p>
-
-
-	<p>Note, in Rails 2.0 fixtures no longer have explicit ids. Later on we&#8217;ll look at snippets for using Foxy Fixtures with auto-completion for associations.</p>
-
-
-	<h2>Public blog controller</h2>
-
-
-	<p>Create a controller for our blog, either via the command prompt:</p>
-
-
-	<pre><code>ruby script/generate controller blog</code></pre>
-
-
-	<p>or directly from the editor with &#x2303; |, and choosing option &#8220;Call Generate Script&#8221;, choose &#8220;Controller&#8221;, give it the name &#8220;blog&#8221;, and empty the list of actions.</p>
-
-
-	<p>Now open <code>blog_controller_test.rb</code>. To find this file quickly press &#x2318; T, enter bct, and select the file.</p>
-
-
-	<p>Note how much cleaner functional tests are now via <code>ActionController::TestCase</code>.</p>
-
-
-	<p>Let&#8217;s do some <span class="caps">TDD</span>. First, delete the <code>test_truth</code> dummy method.</p>
-
-
-	<p>To create a test to show a list of blog articles:</p>
-
-
-	<pre><code>deftg</code></pre>
-
-
-	<p>and &#x21E5; gives:</p>
-
-
-	<p><pre class='syntax'><span class="keyword">def </span><span class="method">test_should_get_action</span>
-  <span class="attribute">@model</span> <span class="punct">=</span> <span class="ident">models</span><span class="punct">(</span><span class="symbol">:fixture_name</span><span class="punct">)</span>
-  <span class="ident">get</span> <span class="symbol">:action</span><span class="punct">,</span> <span class="symbol">:id</span> <span class="punct">=&gt;</span> <span class="attribute">@model</span><span class="punct">.</span><span class="ident">to_param</span>
-  <span class="ident">assert_response</span> <span class="symbol">:success</span>
-
-<span class="keyword">end</span></pre></p>
-
-
-	<p>Type <code>index</code> to replace <code>action</code>. Press &#x21E5;, and then &#x232B; to remove the first line, then press &#x21E5; three times and then &#x232B; to remove the <code>:id =&gt; @model.to_param</code> part. The press &#x21E5; again to go to the end of the method. Now we have:</p>
-
-
-	<p><pre class='syntax'><span class="keyword">def </span><span class="method">test_should_get_index</span>
-  <span class="ident">get</span> <span class="symbol">:index</span>
-  <span class="ident">assert_response</span> <span class="symbol">:success</span>
-
-<span class="keyword">end</span></pre></p>
-
-
-	<p>Now type <code>asg</code>, press &#x21E5;, and type <code>posts</code>, and press &#x21E5; again. This creates an instance variable lookup within an assertion:</p>
-
-
-	<p><pre class='syntax'><span class="ident">assert</span><span class="punct">(</span><span class="ident">posts</span> <span class="punct">=</span> <span class="ident">assigns</span><span class="punct">(</span><span class="symbol">:posts</span><span class="punct">),</span> <span class="punct">&quot;</span><span class="string">Cannot find @posts</span><span class="punct">&quot;)</span></pre></p>
-
-
-	<p>Now, let&#8217;s assert the <span class="caps">HTML</span> format.</p>
-
-
-	<p>Type <code>ass</code> and press &#x21E5;. Type <code>div#posts</code>, press &#x21E5; and &#x232B;, then &#x21E5; twice to place the cursor within the <code>assert_select</code> block:</p>
-
-
-	<p><pre class='syntax'><span class="ident">assert_select</span> <span class="punct">'</span><span class="string">div#posts</span><span class="punct">'</span> <span class="keyword">do</span>
-
-<span class="keyword">end</span></pre></p>
-
-
-	<p>Now we&#8217;ll check that the <code>@posts</code> objects are represented in the <code>div#posts</code> element.</p>
-
-
-	<p>With the cursor inside the <code>assert_select</code>:</p>
-
-
-	<p>Type <code>ass</code>, press &#x21E5;, type <code>div.post</code>, press &#x21E5; twice, and type <code>count</code> (to replace the <code>text</code>). Now press &#x21E5; again, and type <code>posts.size</code>. Press &#x21E5; a final time (it will highlight the <code>do...end</code> block), and press &#x232B;.</p>
-
-
-	<p>Our test method is now finished:</p>
-
-
-	<p><pre class='syntax'><span class="keyword">def </span><span class="method">test_should_get_index</span>
-  <span class="ident">get</span> <span class="symbol">:index</span>
-  <span class="ident">assert_response</span> <span class="symbol">:success</span>
-  <span class="ident">assert</span><span class="punct">(</span><span class="ident">posts</span> <span class="punct">=</span> <span class="ident">assigns</span><span class="punct">(</span><span class="symbol">:posts</span><span class="punct">),</span> <span class="punct">&quot;</span><span class="string">Cannot find @posts</span><span class="punct">&quot;)</span>
-  <span class="ident">assert_select</span> <span class="punct">'</span><span class="string">div#posts</span><span class="punct">'</span> <span class="keyword">do</span>
-    <span class="ident">assert_select</span> <span class="punct">'</span><span class="string">div.post</span><span class="punct">',</span> <span class="symbol">:count</span> <span class="punct">=&gt;</span> <span class="ident">posts</span><span class="punct">.</span><span class="ident">size</span>
-  <span class="keyword">end</span>
-<span class="keyword">end</span></pre></p>
-
-
-	<p><span class="caps">NOTE</span>: there is also a <code>deftp</code> snippet for functional tests to create a <span class="caps">POST</span> test stub.
-To memorize: <code>deftg</code> stands for <code>define test get</code> and <code>deftp</code> stands for <code>define test post</code></p>
-
-
-	<h2>Controller actions</h2>
-
-
-	<p>To navigate to <code>blog_controller.rb</code> there are three options:</p>
-
-
-	<ul>
-	<li>press &#x21E7; &#x2325; &#x2318; &#x2193;, and select &#8220;Controller&#8221; from the drop-down list</li>
-		<li>press &#x2325; &#x2318; &#x2193; and you&#8217;ll go directly to the controller (toggles between the two files)</li>
-		<li>press &#x2318; T, type <code>bc</code>, choose the file, press &#x21A9;.</li>
-	</ul>
-
-
-	<p>Add the <code>index</code> action method:</p>
-
-
-	<p><pre class='syntax'><span class="keyword">def </span><span class="method">index</span>
-  <span class="attribute">@posts</span> <span class="punct">=</span> <span class="constant">Post</span><span class="punct">.</span><span class="ident">find_all_by_published</span><span class="punct">(</span><span class="constant">true</span><span class="punct">)</span>
-<span class="keyword">end</span></pre></p>
-
-
-	<h2>Action views</h2>
-
-
-	<p>To create/navigate to the view, press &#x21E7; &#x2325; &#x2318; &#x2193; and select &#8220;View&#8221; (like above). Or press &#x2325; &#x2318; &#x2193; to toggle between a controller method and it&#8217;s view.</p>
-
-
-	<p>As there are no <code>app/views/blog/index*</code> files, it will prompt you to create a blank view file. By default it guesses <code>index.html.erb</code> (because the method was named <code>index</code>), but of course you can change that in the dialog box.</p>
-
-
-	<p>If instead you got the message &#8220;blog_controller.rb does not have a view&#8221;, note that you first need to save the controller file before hitting &#x21E7; &#x2325; &#x2318; &#x2193; or &#x2325; &#x2318; &#x2193;. Also note that the cursor must be within the scope of a method for &#x21E7; &#x2325; &#x2318; &#x2193; or &#x2325; &#x2318; &#x2193; to work.</p>
-
-
-	<p>Press enter to accept <code>index.html.erb</code>. You are taken to the new file.</p>
-
-
-	<p>Let&#8217;s create <span class="caps">HTML</span> to match the earlier tests.</p>
-
-
-	<p>Type <code>div</code> and press &#x21E5; twice, then type <code>posts</code> and press &#x21E5;:</p>
-
-
-	<p><pre class='syntax'>&lt;div id=&quot;posts&quot;&gt;
-
-&lt;/div&gt;</pre></p>
-
-
-	<p>Inside the <code>div</code> element, type <code>for</code> and press &#x21E5;. This expands into a large ERb-enabled for-loop. Type <code>@posts</code>, press &#x21E5;, type <code>post</code> and press &#x21E5;. The cursor is now inside the for-loop.</p>
-
-
-	<p>Inside the for-loop, type: <code>div</code> and press &#x21E5;. Press &#x232B;, and type <code> class='post'</code> and press &#x21E5; to enter the <code>div</code> element.</p>
-
-
-	<p>Create a <code>&lt;%=  %&gt;</code> element (&#x2303; &gt;). If you press &#x2303; &gt; again, it toggles to <code>&lt;%  %&gt;</code>, and then again and it becomes <code>&lt;%-  -%&gt;</code>, and again and it becomes <code>&lt;%#  %&gt;</code> (a Ruby comment). Pressing &#x2303; &gt; again starts at <code>&lt;%=  %&gt;</code> again.</p>
-
-
-	<p>Enter <code>post.body</code> within the ERb template field.</p>
-
-
-	<p>Actually, we&#8217;ll need to show the subject too, so above the <code>&lt;%= post.body %&gt;</code> line (press &#x2191; followed by &#x2318; &#x21A9;)
-type &#8216;h3&#8217;, and press &#x2303; &lt; (LessThan), then &#x2303; &gt; (GreatherThan), and <code>post.subject</code>.</p>
-
-
-	<p>The resulting line is: <code>&lt;h3&gt;&lt;%= post.subject %&gt;&lt;/h3&gt;</code></p>
-
-
-	<p>Move the cursor down between <code>&lt;% else %&gt;</code> and <code>&lt;% end %&gt;</code>.</p>
-
-
-	<p>Create a simple element <code>&lt;p&gt;&lt;/p&gt;</code> (&#x2303; &#x21E7; W or &#x2303; &lt;). You can change the element type here. Just press &#x21E5; to go inside the element. Type <code>There are no posts available to read. All y'all come back soon, yer hear.</code> because its funny.</p>
-
-
-	<p>Our <code>index.html.erb</code> template is now:</p>
-
-
-	<p><pre class='syntax'>&lt;div id=&quot;posts&quot;&gt;
-  &lt;% if !@posts.blank? %&gt;
-    &lt;% for post in @posts %&gt;
-      &lt;div class=&quot;post&quot;&gt;
-        &lt;h3&gt;&lt;%= post.subject %&gt;&lt;/h3&gt;
-        &lt;%= post.body %&gt;
-      &lt;/div&gt;
-    &lt;% end %&gt;
-  &lt;% else %&gt;
-    &lt;p&gt;There are no posts available to read. All y'all come back soon, yer hear.&lt;/p&gt;
-  &lt;% end %&gt;
-
-&lt;/div&gt;</pre></p>
-
-
-	<p>If we run our functional tests they now pass: run either from the command prompt with <code>rake test:functionals</code> or directly from the editor by pressing &#x2303; \ and press 2 for &#8220;Test Functionals&#8221;</p>
-
-
-	<p>As yet, we have no way for users to leave comments.</p>
-
-
-	<h2>Foxy Fixtures</h2>
-
-
-	<p>Create a comment model:</p>
-
-
-	<pre><code>ruby script/generate model Comment body:text name:string post:references</code></pre>
-
-
-	<p>Note: here <code>post:references</code> is effectively the same as <code>post_id:integer</code>. Within the generated migration it creates <code>t.reference :post</code>. There is also a <code>t.</code> and <code>tcr</code> snippet for references, as for other standard datatypes, which helps setup polymorphic associations.</p>
-
-
-	<p>The generated <code>create_table</code> in <code>002_create_comments.rb</code> is:</p>
-
-
-	<p><pre class='syntax'><span class="ident">create_table</span> <span class="symbol">:comments</span> <span class="keyword">do</span> <span class="punct">|</span><span class="ident">t</span><span class="punct">|</span>
-  <span class="ident">t</span><span class="punct">.</span><span class="ident">text</span> <span class="symbol">:body</span>
-  <span class="ident">t</span><span class="punct">.</span><span class="ident">string</span> <span class="symbol">:name</span>
-  <span class="ident">t</span><span class="punct">.</span><span class="ident">references</span> <span class="symbol">:post</span>
-
-  <span class="ident">t</span><span class="punct">.</span><span class="ident">timestamps</span>
-<span class="keyword">end</span></pre></p>
-
-
-	<p>Run <code>rake db:migrate</code>, or directly from the editor with &#x2303; | and choose option &#8220;Migrate to Current&#8221;.</p>
-
-
-	<p>Now create some comment fixtures so we can look at Foxy Fixtures. Open <code>text/fixtures/comments.yml</code> (&#x2318; T, type <code>cy</code>, press &#x21A9;).</p>
-
-
-	<p>By default, the generated <code>comments.yml</code> starts like:</p>
-
-
-<pre>one:
-  body: MyText
-  name: MyString
-  post:
-
-two:
-  body: MyText
-  name: MyString
-  post:</pre>
-
-	<p>The <code>post</code> fields replace the rails1.2 <code>post_id</code> fields. Now, we can specify the <code>post.yml</code> labels for a post. From above we have <code>published</code> and <code>unpublished</code>. It can be hard to remember what fixtures we have, so there is a key-combo helper.</p>
-
-
-	<p>Put the cursor after <code>post:</code> and press &#x2325; &#x238B;. A drop-down box appears with the names of the <code>posts.yml</code> fixtures. Select <code>published</code> and press &#x21A9;. Repeat for the 2nd fixture. This gives us:</p>
-
-
-<pre>one:
-  body: MyText
-  name: MyString
-  post: published
-
-two:
-  body: MyText
-  name: MyString
-  post: published</pre>
-
-	<h2>Associations</h2>
-
-
-	<p>To enable the Foxy Fixtures, we need to add associations to the model classes.</p>
-
-
-	<p>You can now quickly go from a fixtures file (we&#8217;re in comments.yml) to the model file (&#x21E7; &#x2325; &#x2318; &#x2193;).</p>
-
-
-	<p>Within <code>comment.rb</code> model, create a new line within the class, and type <code>bt</code> and press &#x21E5;. Type <code>post</code>. This creates a snippet:</p>
-
-
-	<p><pre class='syntax'><span class="ident">belongs_to</span> <span class="symbol">:post</span><span class="punct">,</span> <span class="symbol">:class_name</span> <span class="punct">=&gt;</span> <span class="punct">&quot;</span><span class="string">Post</span><span class="punct">&quot;,</span> <span class="symbol">:foreign_key</span> <span class="punct">=&gt;</span> <span class="punct">&quot;</span><span class="string">post_id</span><span class="punct">&quot;</span></pre></p>
-
-
-	<p>The class name and foreign key are now generated from the association name. You can change them by tabbing across. But, we only need the default, so we can delete these options.</p>
-
-
-	<p>Press &#x21E5; and &#x232B; to remove the <code>:class_name</code> and <code>:foreign_key</code> options. The <code>Comment</code> class is now:</p>
-
-
-	<p><pre class='syntax'><span class="keyword">class </span><span class="class">Comment</span> <span class="punct">&lt;</span> <span class="constant">ActiveRecord</span><span class="punct">::</span><span class="constant">Base</span>
-  <span class="ident">belongs_to</span> <span class="symbol">:post</span>
-<span class="keyword">end</span></pre></p>
-
-
-	<p>Now go to the <code>Post</code> class. Press &#x2318; T and type <code>post</code> and select the model file, and press &#x21A9;.</p>
-
-
-	<p>Create a new line within the <code>Post</code> class (&#x2318; &#x21A9;). Type <code>hm</code> and press &#x21E5; to generate a <code>has_many</code> association. Type <code>comment</code>, and the resulting snippet is:</p>
-
-
-	<p><pre class='syntax'><span class="ident">has_many</span> <span class="symbol">:comments</span><span class="punct">,</span> <span class="symbol">:class_name</span> <span class="punct">=&gt;</span> <span class="punct">&quot;</span><span class="string">comment</span><span class="punct">&quot;,</span> <span class="symbol">:foreign_key</span> <span class="punct">=&gt;</span> <span class="punct">&quot;</span><span class="string">class_name_id</span><span class="punct">&quot;</span></pre></p>
-
-
-	<p>We don&#8217;t need the options. So press &#x21E5; once and then &#x232B;.</p>
-
-
-	<p><pre class='syntax'><span class="keyword">class </span><span class="class">Post</span> <span class="punct">&lt;</span> <span class="constant">ActiveRecord</span><span class="punct">::</span><span class="constant">Base</span>
-  <span class="ident">has_many</span> <span class="symbol">:comments</span>
-<span class="keyword">end</span></pre></p>
-
-
-	<p>Note: there is also a <code>has_many :through</code> snippet. Type <code>hmt</code> and &#x21E5; to activate it.</p>
-
-
-	<p>Finally, we can run our tests since adding the <code>Comment</code> model + fixtures (&#x2303; \).</p>
-
-
-<pre>rake test</pre>
-
-	<h2>Routes</h2>
-
-
-	<p>Open the routes file (&#x2318; T, type <code>routes</code> and press &#x21A9;).</p>
-
-
-	<p>Change the routes file to:</p>
-
-
-	<p><pre class='syntax'><span class="constant">ActionController</span><span class="punct">::</span><span class="constant">Routing</span><span class="punct">::</span><span class="constant">Routes</span><span class="punct">.</span><span class="ident">draw</span> <span class="keyword">do</span> <span class="punct">|</span><span class="ident">map</span><span class="punct">|</span>
-  <span class="ident">map</span><span class="punct">.</span><span class="ident">resources</span> <span class="symbol">:posts</span>
-  <span class="ident">map</span><span class="punct">.</span><span class="ident">connect</span> <span class="punct">'</span><span class="string">:controller/:action/:id</span><span class="punct">'</span>
-  <span class="ident">map</span><span class="punct">.</span><span class="ident">connect</span> <span class="punct">'</span><span class="string">:controller/:action/:id.:format</span><span class="punct">'</span>
-<span class="keyword">end</span></pre></p>
-
-
-	<h2>Creating Posts</h2>
-
-
-	<p>From the <code>Post</code> model class (<code>post.rb</code>) you can now quickly navigate to a controller
-of the same name. It supports either singular or plural controller names, but
-will default to the plural name, which is the <span class="caps">REST</span>/resources preferred name.</p>
-
-
-	<p>To create a <code>PostsController</code>, use the &#8216;Go To&#8217; hot key (as above) &#x21E7; &#x2325; &#x2318; &#x2193; and select &#8216;Controller&#8217;. As there is no <code>post_controller.rb</code> nor <code>posts_controller.rb</code> it will create a <code>posts_controller.rb</code> controller file; which is what we want here.</p>
-
-
-	<p>Note; at this stage you could use the Rails 2.0 <code>scaffold</code> generator to create the <code>posts_controller.rb</code> (and tests and routes).</p>
-
-
-	<p>In the blank file, we need to create a controller class.</p>
-
-
-Type <code>cla</code> and &#x21E5;, and select &#8220;Create controller class&#8221;. Type <code>Posts</code> and &#x21E5;,
-<code>post</code> and &#x21E5;, and finally, <code>Post</code> and &#x21E5;. This leaves the cursor in the middle
-of the generated class:
-
-	<p><pre class='syntax'><span class="keyword">class </span><span class="class">PostsController</span> <span class="punct">&lt;</span> <span class="constant">ApplicationController</span>
-  <span class="ident">before_filter</span> <span class="symbol">:find_post</span>
-
-
-
-  <span class="ident">private</span>
-  <span class="keyword">def </span><span class="method">find_post</span>
-    <span class="attribute">@post</span> <span class="punct">=</span> <span class="constant">Post</span><span class="punct">.</span><span class="ident">find</span><span class="punct">(</span><span class="ident">params</span><span class="punct">[</span><span class="symbol">:id</span><span class="punct">])</span> <span class="keyword">if</span> <span class="ident">params</span><span class="punct">[</span><span class="symbol">:id</span><span class="punct">]</span>
-  <span class="keyword">end</span>
-<span class="keyword">end</span></pre></p>
-
-
-	<h2><span class="caps">TDD</span> for Posts controller</h2>
-
-
-	<p>Currently there is not a functional test for our <code>posts_controller.rb</code>. To create it, use the &#8216;Go To&#8217; hot key (&#x21E7; &#x2325; &#x2318; &#x2193;) and select &#8216;Functional Test&#8217;. This will create a blank file.</p>
-
-
-	<p>Type <code>cla</code> and &#x21E5;, and select &#8220;Create functional test class&#8221;.
-Type <code>Posts</code> and &#x21E5;. (The functional test class name
-should match the controller class, with <code>Test</code> suffixed to it).</p>
-
-
-	<p>The functional test class snippet gives you a <code>deft</code> stub. If you
-press &#x21E5; now, it creates a generic test method snippet:</p>
-
-
-	<p><pre class='syntax'><span class="keyword">def </span><span class="method">test_case_name</span>
-
-<span class="keyword">end</span></pre></p>
-
-
-	<p>Instead, we will use the <code>deftg</code> (GET request) and <code>deftp</code> (POST request) snippets.</p>
-
-
-	<p>Create a test for the <code>index</code>, <code>new</code> and <code>edit</code> actions. For <code>index</code> and <code>new</code>, we can delete the <code>@model = models(:fixture_name)</code>,
-etc parts.</p>
-
-
-	<p>To test for the <code>create</code> action, type <code>deftp</code> and &#x21E5;. Type <code>create</code> and &#x21E5;, type <code>post</code> and &#x21E5;, type &#x232B; and &#x21E5;, and again &#x232B; and &#x21E5;. Now enter in a hash of the values to pass in for the test, say <code>:subject =&gt; 'Test', :body =&gt; 'Some body', :published =&gt; '1'</code>. The result should look like:</p>
-
-
-	<p><pre class='syntax'><span class="keyword">def </span><span class="method">test_should_post_create</span>
-  <span class="ident">post</span> <span class="symbol">:create</span><span class="punct">,</span> <span class="symbol">:post</span> <span class="punct">=&gt;</span> <span class="punct">{</span> <span class="symbol">:subject</span> <span class="punct">=&gt;</span> <span class="punct">'</span><span class="string">Test</span><span class="punct">',</span> <span class="symbol">:body</span> <span class="punct">=&gt;</span> <span class="punct">'</span><span class="string">Some body</span><span class="punct">',</span> <span class="symbol">:published</span> <span class="punct">=&gt;</span> <span class="punct">'</span><span class="string">1</span><span class="punct">'</span> <span class="punct">}</span>
-  <span class="ident">assert_response</span> <span class="symbol">:redirect</span>
-
-<span class="keyword">end</span></pre></p>
-
-
-	<p>On the line after the <code>assert_response</code> expression, we&#8217;ll test
-for where we want to be redirected to.</p>
-
-
-	<p>If you type <code>art</code> you create an old-style <code>assert_redirected_to :action =&gt; "index"</code>
-snippet.</p>
-
-
-	<p>In addition there are now various <code>assert_redirected_to</code> snippets that
-use resourceful routes:</p>
-
-
-	<ul>
-	<li>artp   &#8211; <code>assert_redirected_to model_path(@model)</code></li>
-		<li>artpp  &#8211; <code>assert_redirected_to models_path</code></li>
-		<li>artnp  &#8211; <code>assert_redirected_to parent_child_path(@parent, @child)</code></li>
-		<li>artnpp &#8211; <code>assert_redirected_to parent_child_path(@parent)</code></li>
-	</ul>
-
-
-	<p>As we&#8217;ll see later, this naming scheme is used for other snippets that
-use resourceful routes, like <code>link_to</code> and <code>redirect_to</code>.</p>
-
-
-	<p>Type <code>artpp</code> and &#x21E5;, and type <code>post</code>, to assert that the <code>create</code>
-action must redirect to the index page.</p>
-
-
-	<p>The final <code>test_should_post_create</code> method is:</p>
-
-
-	<p><pre class='syntax'><span class="keyword">def </span><span class="method">test_should_post_create</span>
-  <span class="ident">post</span> <span class="symbol">:create</span><span class="punct">,</span> <span class="symbol">:post</span> <span class="punct">=&gt;</span> <span class="punct">{</span> <span class="symbol">:subject</span> <span class="punct">=&gt;</span> <span class="punct">'</span><span class="string">Test</span><span class="punct">',</span> <span class="symbol">:body</span> <span class="punct">=&gt;</span> <span class="punct">'</span><span class="string">Some body</span><span class="punct">',</span> <span class="symbol">:published</span> <span class="punct">=&gt;</span> <span class="punct">'</span><span class="string">1</span><span class="punct">'</span> <span class="punct">}</span>
-  <span class="ident">assert_response</span> <span class="symbol">:redirect</span>
-  <span class="ident">assert_redirected_to</span> <span class="ident">posts_path</span>
-<span class="keyword">end</span></pre></p>
-
-
-	<p>Running our tests (<code>rake test:functionals</code> or &#x2303; \) shows all these new tests failing.</p>
-
-
-	<h2>Views</h2>
-
-
-	<p>Go back to the <code>posts_controller.rb</code> file (&#x2325; &#x2318; &#x2193;).</p>
-
-
-	<p>Now add three actions &#8211; <code>index</code>, <code>new</code> and <code>edit</code>. New methods can be created
-with the <code>def</code> snippet:</p>
-
-
-	<p><pre class='syntax'><span class="keyword">class </span><span class="class">PostsController</span> <span class="punct">&lt;</span> <span class="constant">ApplicationController</span>
-  <span class="ident">before_filter</span> <span class="symbol">:find_post</span>
-
-  <span class="keyword">def </span><span class="method">index</span>
-    <span class="attribute">@posts</span> <span class="punct">=</span> <span class="constant">Post</span><span class="punct">.</span><span class="ident">find</span><span class="punct">(</span><span class="symbol">:all</span><span class="punct">)</span>
-  <span class="keyword">end</span>
-
-  <span class="keyword">def </span><span class="method">new</span>
-    <span class="attribute">@post</span> <span class="punct">=</span> <span class="constant">Post</span><span class="punct">.</span><span class="ident">new</span>
-  <span class="keyword">end</span>
-
-  <span class="keyword">def </span><span class="method">edit</span>
-  <span class="keyword">end</span>
-
-  <span class="ident">private</span>
-  <span class="keyword">def </span><span class="method">find_post</span>
-    <span class="attribute">@post</span> <span class="punct">=</span> <span class="constant">Post</span><span class="punct">.</span><span class="ident">find</span><span class="punct">(</span><span class="ident">params</span><span class="punct">[</span><span class="symbol">:id</span><span class="punct">])</span> <span class="keyword">if</span> <span class="ident">params</span><span class="punct">[</span><span class="symbol">:id</span><span class="punct">]</span>
-  <span class="keyword">end</span>
-<span class="keyword">end</span></pre></p>
-
-
-	<p>Note: the <code>index</code> method could be created by typing <code>def</code>, &#x21E5;, <code>index</code>, &#x21E5;,  <code>@posts = Post.fina</code>, &#x21E5;, &#x232B;.</p>
-
-
-	<p>Now we need templates for the <code>index</code>, <code>new</code> and <code>edit</code> actions.</p>
-
-
-	<p>Place the cursor inside the <code>index</code> method,
-and use the &#8216;Go To&#8217; hot key (&#x21E7; &#x2325; &#x2318; &#x2193;)
-and select &#8216;View&#8217;. A dialog box will pop up asking for the name of the new
-template (as there are no <code>app/views/posts/index*</code> files). By default, the
-suffix is now <code>.html.erb</code> rather than the old <code>.rhtml</code>. Press &#x21A9;,
-to accept <code>index.html.erb</code> as your template name.</p>
-
-
-	<p>Let&#8217;s just create a simple table showing the Posts.</p>
-
-
-	<p>Type <code>table</code> and &#x2303; &lt; to generate <code>&lt;table&gt;&lt;/table&gt;</code>, and
-press &#x21A9; to put the tags on separate lines.</p>
-
-
-	<p>Do the same to create a <code>&lt;tbody&gt;&lt;/tbody&gt;</code> element.</p>
-
-
-	<p>Inside the <code>&lt;tbody&gt;&lt;/tbody&gt;</code> we want to iterate over the <code>@posts</code>,
-one per <code>&lt;tr&gt;&lt;/tr&gt;</code> row.</p>
-
-
-	<p>Press &#x2303; &gt;, three times, to create a <code>&lt;%- -%&gt;</code> tag. Inside it
-type <code>@posts.each do |post|</code>.</p>
-
-
-	<p>On the next line (&#x2318; &#x21A9;), type <code>end</code> and &#x21E5;, to create <code>&lt;% end -%&gt;</code>.
-We now have a Ruby block within this ERb template.</p>
-
-
-	<p>Inside the block, create a <code>&lt;tr&gt;&lt;/tr&gt;</code> element, and within it
-create a <code>&lt;td&gt;&lt;/td&gt;</code> element. We&#8217;ll skip over anything fancy
-here, and just put the post&#8217;s subject here.</p>
-
-
-	<p>Type <code>post.subject</code> and select it. Now press &#x2303; &gt; to wrap
-the selected text inside <code>&lt;%= post.subject %&gt;</code>.</p>
-
-
-	<p>The resulting <code>index.html.erb</code> is:</p>
-
-
-	<p><pre class='syntax'>&lt;table&gt;
-  &lt;tbody&gt;
-    &lt;%- @posts.each do |post| -%&gt;
-      &lt;tr&gt;
-        &lt;td&gt;&lt;%= post.subject %&gt;&lt;/td&gt;
-      &lt;/tr&gt;
-    &lt;% end -%&gt;
-  &lt;/tbody&gt;
-&lt;/table&gt;</pre></p>
-
-
-	<h2>Forms</h2>
-
-
-	<p>Place the cursor inside the <code>new</code> method,
-and use the &#8216;Go To&#8217; hot key (&#x21E7; &#x2325; &#x2318; &#x2193;)
-and select &#8216;View&#8217;. Press &#x21A9; to accept <code>new.html.erb</code>.</p>
-
-
-	<p>Inside the blank <code>new.html.erb</code> file, type <code>ffe</code> and press &#x21E5;, and type <code>post</code>
-and press &#x21E5; twice:</p>
-
-
-	<p><pre class='syntax'>&lt;%= error_messages_for :post %&gt;
-&lt;% form_for @post do |f| -%&gt;
-
-&lt;% end -%&gt;</pre></p>
-
-
-<code>form_for</code> is the Rails 2.0 preferred helper for managing forms, and
-there are now snippets for common form_for helpers. There are <code>ff</code> and <code>ffe</code>
-snippets; the former does not have the error messages section.
-
-	<p>To create a label and text field for the <code>subject</code> attribute:</p>
-
-
-	<p>Create a <code>&lt;p&gt;&lt;/p&gt;</code> block (Press &#x2303; &lt;, then &#x21E5;, then &#x21A9;).
-Type <code>f.</code> and &#x21E5;, and select &#8220;Label&#8221;. Type <code>subject</code>, press &#x21E5; and press &#x232B;.
-Create a <code>&lt;br /&gt;</code> (&#x2303; &#x21A9;).
-Type <code>f.</code> and &#x21E5;, and select &#8220;Text Field&#8221;. Type <code>subject</code>.</p>
-
-
-	<p>This gives us:</p>
-
-
-	<p><pre class='syntax'>&lt;%= error_messages_for :post %&gt;
-&lt;% form_for @post do |f| -%&gt;
-  &lt;p&gt;
-    &lt;%= f.label :subject %&gt;&lt;br /&gt;
-    &lt;%= f.text_field :subject %&gt;
-  &lt;/p&gt;
-&lt;% end -%&gt;</pre></p>
-
-
-	<p>Now repeat for <code>body</code> and <code>published</code> fields.</p>
-
-
-	<p>Note, for <code>published</code>, you might change the label to <code>Published yet?</code> by tabbing
-into the default string file.</p>
-
-
-	<p>Finally, add a &#8220;Submit&#8221; button using the <code>f.</code> snippet tab completion.</p>
-
-
-	<p>Start <code>script/server</code> from the prompt and you can now view this form at <a href="http://localhost:3000/posts/new">http://localhost:3000/posts/new</a></p>
-
-
-	<p>The final form is:</p>
-
-
-	<p><pre class='syntax'>&lt;%= error_messages_for :post %&gt;
-&lt;% form_for @post do |f| -%&gt;
-  &lt;p&gt;
-    &lt;%= f.label :subject %&gt;&lt;br /&gt;
-    &lt;%= f.text_field :subject %&gt;
-  &lt;/p&gt;
-  &lt;p&gt;
-    &lt;%= f.label :body %&gt;&lt;br /&gt;
-    &lt;%= f.text_area :body %&gt;
-  &lt;/p&gt;
-  &lt;p&gt;
-    &lt;%= f.label :published, &quot;Published yet?&quot; %&gt;&lt;br /&gt;
-    &lt;%= f.check_box :published %&gt;
-  &lt;/p&gt;
-  &lt;p&gt;
-    &lt;%= f.submit &quot;Submit&quot; %&gt;
-  &lt;/p&gt;
-&lt;% end -%&gt;</pre></p>
-
-
-	<p>Note: if you got <code>&lt;br&gt;</code> when hitting &#x2303; &#x21A9; instead of <code>&lt;br /&gt;</code> then you might want to go to the preferences of TextMate (&#x2318; ,), choose tab &#8220;Advanced&#8221;, choose &#8220;Shell Variables&#8221;, click the + sign to add a new shell variable, and give it the name <code>TM_XHTML</code> and a value of <code> /</code></p>
-
-
-	<h2>Partials</h2>
-
-
-	<p>The form we just created is exactly the same as the form required for the <code>edit.html.erb</code> template.</p>
-
-
-	<p>Instead of copy+pasting it into the <code>edit.html.erb</code> file, we&#8217;ll create a partial
-template.</p>
-
-
-	<p>Select the entire form (&#x2318; A), and press &#x2303; &#x21E7; H and a dialog box appears.
-Type in <code>form</code> and press &#x21A9;.</p>
-
-
-	<p>You&#8217;ll notice a new file <code>_form.html.erb</code> has appeared which contains the code you had selected,
-while the code in the file <code>new.html.erb</code> has been replaced by:</p>
-
-
-	<pre><code>&lt;%= render :partial =&gt; 'form' %&gt;</code></pre>
-
-
-	<p>Now copy and paste this into the <code>edit.html.erb</code> file. To create this file,
-return to the controller (from the <code>new.html.erb</code> file, press &#x2325; &#x2318; &#x2193;), go to the <code>edit</code> action,
-and use &#x2325; &#x2318; &#x2193; again to create the <code>edit.html.erb</code> template file.</p>
-
-
-	<h2>Link helpers</h2>
-
-
-At the bottom of the <code>new.html.erb</code> we want a link back to the list of all posts
-(within the posts controller, not the public blog controller). This
-will be the <code>index</code> action, and will be accessible via the resources route
-<code>posts_path</code>.
-
-	<p>There are several <code>link_to</code> snippets that support the resources routes:</p>
-
-
-	<ul>
-	<li>lip   &#8211; <code>&lt;%= link_to "link text...", model_path(@model) %&gt;</code></li>
-		<li>lipp  &#8211; <code>&lt;%= link_to "link text...", models_path %&gt;</code></li>
-		<li>linp  &#8211; <code>&lt;%= link_to "link text...", parent_child_path(@parent, @child) %&gt;</code></li>
-		<li>linpp &#8211; <code>&lt;%= link_to "link text...", parent_child_path(@parent) %&gt;</code></li>
-		<li>lim   &#8211; <code>&lt;%= link_to model.name, model_path(model) %&gt;</code></li>
-	</ul>
-
-
-	<p>The tab stop points are in useful places.</p>
-
-
-So, to create our link to the posts page, type <code>lipp</code> and &#x21E5;, type
-<code>Show all posts</code>, press &#x21E5; twice and type <code>post</code>.
-
-	<h2>Controllers: <code>respond_to</code> and <code>redirect_to</code></h2>
-
-
-	<p>Now we&#8217;ll add a <code>create</code> action to the <code>posts_controller.rb</code>. Let&#8217;s go there (&#x2325; &#x2318; &#x2193;).</p>
-
-
-Below the <code>edit</code> method type <code>def</code> and &#x21E5;, and type
-<code>create</code> and &#x21E5;. Now fill out the <code>create</code> action like:
-
-	<p><pre class='syntax'><span class="keyword">def </span><span class="method">create</span>
-  <span class="attribute">@post</span> <span class="punct">=</span> <span class="constant">Post</span><span class="punct">.</span><span class="ident">new</span><span class="punct">(</span><span class="ident">params</span><span class="punct">[</span><span class="symbol">:post</span><span class="punct">])</span>
-  <span class="keyword">if</span> <span class="attribute">@post</span><span class="punct">.</span><span class="ident">save</span>
-
-  <span class="keyword">else</span>
-
-  <span class="keyword">end</span>
-<span class="keyword">end</span></pre></p>
-
-
-	<p>Place the cursor in the <code>true</code> section of the <code>if</code> statement.
-Type <code>repp</code> and &#x21E5; to create a <code>redirect_to</code> expression. Press &#x21E5;
-again and replace the selected text with <code>post</code>.</p>
-
-
-	<p>Like the various <code>link_to</code> snippets, there are matching <code>redirect_to</code>
-snippets.</p>
-
-
-	<ul>
-	<li>rep   &#8211; <code>redirect_to(model_path(@model))</code></li>
-		<li>repp  &#8211; <code>redirect_to(models_path)</code></li>
-		<li>renp  &#8211; <code>redirect_to(parent_child_path(@parent, @child))</code></li>
-		<li>renpp &#8211; <code>redirect_to(parent_child_path(@parent))</code></li>
-	</ul>
-
-
-	<p>There are tab stops in useful places.</p>
-
-
-In the <code>false</code> section of the <code>if</code> expression, we&#8217;ll demonstrate the
-<code>respond_to</code> block. There are two ways to generate a <code>respond_to</code> block.
-
-	<p>Type <code>rest</code> and &#x21E5;, and you get a standard empty block you can work with:</p>
-
-
-	<p><pre class='syntax'><span class="ident">respond_to</span> <span class="keyword">do</span> <span class="punct">|</span><span class="ident">wants</span><span class="punct">|</span>
-  <span class="ident">wants</span><span class="punct">.</span><span class="ident">html</span> <span class="punct">{</span>  <span class="punct">}</span>
-<span class="keyword">end</span></pre></p>
-
-
-	<p>Press &#x21E5; twice to get inside the <code>wants.html</code> block, type <code>ra</code>, press &#x21E5;, then type <code>new</code>. The final block is:</p>
-
-
-	<p><pre class='syntax'><span class="ident">respond_to</span> <span class="keyword">do</span> <span class="punct">|</span><span class="ident">wants</span><span class="punct">|</span>
-  <span class="ident">wants</span><span class="punct">.</span><span class="ident">html</span> <span class="punct">{</span> <span class="ident">render</span> <span class="symbol">:action</span> <span class="punct">=&gt;</span> <span class="punct">&quot;</span><span class="string">new</span><span class="punct">&quot;</span> <span class="punct">}</span>
-<span class="keyword">end</span></pre></p>
-
-
-	<p>Alternately, there is the &#8220;upgrade&#8221; hot key (&#x21E7; &#x2318; H), where you can convert some
-existing selected code, into a <code>respond_to</code> block.</p>
-
-
-Select the whole line containing the <code>redirect_to</code> expression from the
-<code>true</code> section of the <code>if</code> statement (&#x21E7; &#x2318; L).
-
-	<p>Press &#x21E7; &#x2318; H and the line is replaced with:</p>
-
-
-	<p><pre class='syntax'><span class="ident">respond_to</span> <span class="keyword">do</span> <span class="punct">|</span><span class="ident">wants</span><span class="punct">|</span>
-  <span class="ident">wants</span><span class="punct">.</span><span class="ident">html</span> <span class="keyword">do</span>
-    <span class="ident">redirect_to</span><span class="punct">(</span><span class="ident">posts_path</span><span class="punct">)</span>
-  <span class="keyword">end</span>
-  <span class="ident">wants</span><span class="punct">.</span><span class="ident">js</span> <span class="punct">{</span>  <span class="punct">}</span>
-<span class="keyword">end</span></pre></p>
-
-
-	<p>The <code>js</code> is the first tab stop. The point of this hot key is to instantly
-refactor your existing html respond code, and support a second response
-format.</p>
-
-
-	<p>For now remove the line with <code>wants.js</code> (&#x2303; &#x21E7; K).</p>
-
-
-	<p>The completed <code>create</code> action is:</p>
-
-
-	<p><pre class='syntax'><span class="keyword">def </span><span class="method">create</span>
-  <span class="attribute">@post</span> <span class="punct">=</span> <span class="constant">Post</span><span class="punct">.</span><span class="ident">new</span><span class="punct">(</span><span class="ident">params</span><span class="punct">[</span><span class="symbol">:post</span><span class="punct">])</span>
-  <span class="keyword">if</span> <span class="attribute">@post</span><span class="punct">.</span><span class="ident">save</span>
-    <span class="ident">respond_to</span> <span class="keyword">do</span> <span class="punct">|</span><span class="ident">wants</span><span class="punct">|</span>
-      <span class="ident">wants</span><span class="punct">.</span><span class="ident">html</span> <span class="keyword">do</span>
-        <span class="ident">redirect_to</span><span class="punct">(</span><span class="ident">posts_path</span><span class="punct">)</span>
-      <span class="keyword">end</span>
-    <span class="keyword">end</span>
-  <span class="keyword">else</span>
-    <span class="ident">respond_to</span> <span class="keyword">do</span> <span class="punct">|</span><span class="ident">wants</span><span class="punct">|</span>
-      <span class="ident">wants</span><span class="punct">.</span><span class="ident">html</span> <span class="punct">{</span> <span class="ident">render</span> <span class="symbol">:action</span> <span class="punct">=&gt;</span> <span class="punct">&quot;</span><span class="string">new</span><span class="punct">&quot;</span> <span class="punct">}</span>
-    <span class="keyword">end</span>
-  <span class="keyword">end</span>
-<span class="keyword">end</span></pre></p>
-
-
-	<p>Yes you&#8217;d probably only have one <code>respond_to</code> block, but this is a
-demo so I am taking the scenic route.</p>
-
-
-	<h2>Our application so far</h2>
-
-
-	<p>In the browser, we can create posts via <a href="http://localhost:3000/posts/new">http://localhost:3000/posts/new</a>
-and then view them as a blog visitor at <a href="http://localhost:3000/blog">http://localhost:3000/blog</a>.</p>
-
-
-	<h2>Some more migrations</h2>
-
-
-	<p>We&#8217;re looking for the following additions:</p>
-
-
-	<ul>
-	<li>rename the column <code>name</code> of table <code>comments</code> to <code>author</code></li>
-		<li>add a new column <code>author_url</code> to table <code>comments</code></li>
-		<li>add an index to the column <code>post_id</code> of the <code>comments</code> table</li>
-	</ul>
-
-
-	<p>Let&#8217;s try to do this all in one migrations file. Start Quick Migration (&#x2303; &#x21E7; M). Let&#8217;s name it <code>ModifyComments</code>. A new migrations file <code>003_modify_comments.rb</code> is created and opened, and the cursor is placed behind the <code>mtab</code> trigger. For now delete <code>mtab</code> and instead enter <code>mcol</code> and press &#x21E5;. Choose <code>Rename / Rename Column</code> (3). Type <code>comments</code> &#x21E5; <code>name</code> &#x21E5; <code>author</code> &#x21E5; &#x21A9;.</p>
-
-
-	<p>Again type <code>mcol</code> and &#x21E5;. This time choose <code>Add / Remove Column</code> (1). Type <code>comments</code> &#x21E5; <code>author_url</code>, then &#x21E5; twice, and press &#x21A9;.</p>
-
-
-	<p>Now type <code>mind</code> and &#x21E5;. Choose <code>Add / Remove Index</code> (1). Type <code>comments</code> &#x21E5; <code>post_id</code>.</p>
-
-
-	<p>The end result looks like this:</p>
-
-
-	<p><pre class='syntax'><span class="keyword">class </span><span class="class">ModifyComments</span> <span class="punct">&lt;</span> <span class="constant">ActiveRecord</span><span class="punct">::</span><span class="constant">Migration</span>
-  <span class="keyword">def </span><span class="method">self.up</span>
-    <span class="ident">rename_column</span> <span class="symbol">:comments</span><span class="punct">,</span> <span class="symbol">:name</span><span class="punct">,</span> <span class="symbol">:author</span>
-    <span class="ident">add_column</span> <span class="symbol">:comments</span><span class="punct">,</span> <span class="symbol">:author_url</span><span class="punct">,</span> <span class="symbol">:string</span>
-    <span class="ident">add_index</span> <span class="symbol">:comments</span><span class="punct">,</span> <span class="symbol">:post_id</span>
-  <span class="keyword">end</span>
-
-  <span class="keyword">def </span><span class="method">self.down</span>
-    <span class="ident">remove_index</span> <span class="symbol">:comments</span><span class="punct">,</span> <span class="symbol">:post_id</span>
-    <span class="ident">remove_column</span> <span class="symbol">:comments</span><span class="punct">,</span> <span class="symbol">:author_url</span>
-    <span class="ident">rename_column</span> <span class="symbol">:comments</span><span class="punct">,</span> <span class="symbol">:author</span><span class="punct">,</span> <span class="symbol">:name</span>
-  <span class="keyword">end</span>
-<span class="keyword">end</span></pre></p>
-
-
-	<p>Notice how the <code>down</code> method calls are in reversed order of the <code>up</code> method calls.</p>
-
-
-	<p>Save the file (&#x2318; S) and migrate to current (&#x2303; |).</p>
-
-
-	<p>Be sure to modify the comments fixture file. Go there (&#x2318; T, press <code>cy</code>, choose <code>comments.yml</code>). Rename <code>name</code> to <code>author</code> and add a row for <code>author_url</code> for each comment. Check your tests again (&#x2303; \, choose option 1). All tests should pass.</p>
-
-
-	<p>Futhermore we&#8217;d like to know when a post was published. To do this we&#8217;ll want the following modifications:</p>
-
-
-	<ul>
-	<li>keep track of the datetime when a post was published.</li>
-		<li>remove the column published from the posts table because it can be determined if a post is published by looking at whether or not a value is present for the published date.</li>
-	</ul>
-
-
-	<p>Start Quick Migration (&#x2303; &#x21E7; M). Let&#8217;s name it <code>AddPublishedAtForPosts</code>. A new migrations file <code>004_add_published_at_for_posts.rb</code> is created and opened, and the cursor is placed behind the <code>mtab</code> trigger. Again delete <code>mtab</code> and instead enter <code>mcol</code> and press &#x21E5;. Choose <code>Add / Remove Column</code> (1). Type <code>posts</code> &#x21E5; <code>published_at</code> &#x21E5; <code>datetime</code> &#x21E5; and &#x21A9;.</p>
-
-
-	<p>Again type <code>mcol</code> and &#x21E5;. Choose <code>Remove / Add Column</code> (5). Type <code>posts</code> &#x21E5; <code>published</code> and press &#x21E5; twice.</p>
-
-
-	<p>The end result looks like this:</p>
-
-
-	<p><pre class='syntax'><span class="keyword">class </span><span class="class">AddPublishedAtForPosts</span> <span class="punct">&lt;</span> <span class="constant">ActiveRecord</span><span class="punct">::</span><span class="constant">Migration</span>
-  <span class="keyword">def </span><span class="method">self.up</span>
-    <span class="ident">add_column</span> <span class="symbol">:posts</span><span class="punct">,</span> <span class="symbol">:published_at</span><span class="punct">,</span> <span class="symbol">:datetime</span>
-    <span class="ident">remove_column</span> <span class="symbol">:posts</span><span class="punct">,</span> <span class="symbol">:published</span>
-  <span class="keyword">end</span>
-
-  <span class="keyword">def </span><span class="method">self.down</span>
-    <span class="ident">add_column</span> <span class="symbol">:posts</span><span class="punct">,</span> <span class="symbol">:published</span><span class="punct">,</span> <span class="symbol">:boolean</span>
-    <span class="ident">remove_column</span> <span class="symbol">:posts</span><span class="punct">,</span> <span class="symbol">:published_at</span>
-  <span class="keyword">end</span>
-<span class="keyword">end</span></pre></p>
-
-
-	<p>Notice how the <code>Remove / Add Column</code> command automagically determined in the <code>down</code> method the column type of column <code>published</code> to be a <code>boolean</code>. It determines this by looking at the current state of your <code>db/schema.rb</code> file.</p>
-
-
-	<p>Save the file (&#x2318; S) and migrate to current (&#x2303; |).</p>
-
-
-	<p>Now we need to modify the posts fixtures file. Go there (&#x2318; T, type <code>pyml</code>, choose <code>posts.yml</code>). Replace the line <code>published: true</code> by <code>published_at: 2008-1-1</code>.</p>
-
-
-	<p>Modify the posts functional test, first go there (&#x21E7; &#x2325; &#x2318; &#x2193;, choose &#8220;Go to Functional Test&#8221;). Replace <code>:published =&gt; '1'</code> by <code>:published_at =&gt; Date.new(2008, 1, 1)</code>.</p>
-
-
-	<p>Modify the post model, first go there (&#x21E7; &#x2325; &#x2318; &#x2193;, choose &#8220;Go to Model&#8221;). Have the code look like:</p>
-
-
-	<p><pre class='syntax'><span class="keyword">class </span><span class="class">Post</span> <span class="punct">&lt;</span> <span class="constant">ActiveRecord</span><span class="punct">::</span><span class="constant">Base</span>
-  <span class="ident">has_many</span> <span class="symbol">:comments</span>
-
-  <span class="keyword">def </span><span class="method">published</span>
-    <span class="punct">!</span><span class="constant">self</span><span class="punct">.</span><span class="ident">published_at</span><span class="punct">.</span><span class="ident">nil?</span>
-  <span class="keyword">end</span>
-
-  <span class="keyword">def </span><span class="method">published=</span><span class="punct">(</span><span class="ident">publish</span><span class="punct">)</span>
-    <span class="keyword">if</span> <span class="ident">publish</span>
-      <span class="constant">self</span><span class="punct">.</span><span class="ident">published_at</span> <span class="punct">=</span> <span class="constant">DateTime</span><span class="punct">.</span><span class="ident">now</span> <span class="keyword">if</span> <span class="constant">self</span><span class="punct">.</span><span class="ident">published_at</span><span class="punct">.</span><span class="ident">nil?</span>
-    <span class="keyword">else</span>
-      <span class="constant">self</span><span class="punct">.</span><span class="ident">published_at</span> <span class="punct">=</span> <span class="constant">nil</span>
-    <span class="keyword">end</span>
-  <span class="keyword">end</span>
-<span class="keyword">end</span></pre></p>
-
-
-	<p>Modify the <code>blog_controller.rb</code> file. Replace <code>Post.find_all_by_published(true)</code> by <code>Post.find(:all, :conditions =&gt; "published_at IS NOT NULL")</code>.</p>
-
-
-	<p>Finally, check your tests again (&#x2303; \). All tests should pass.</p>
-
-
-	<h1><span class="caps">TODO</span></h1>
-
-
-	<ul>
-	<li>Model snippets (validates_&#8230;)</li>
-		<li>link_to(model) (ltm)</li>
-		<li><span class="caps">RJS</span> demo</li>
-	</ul>
-    <p class="coda">
-      <a href="http://drnicwilliams.com">Dr Nic Williams</a>, 28th February 2008<br>
-      Theme extended from <a href="http://rb2js.rubyforge.org/">Paul Battley</a>
-    </p>    
-
-    <!--
-	  * Matt A: "I'm new to this country, but I must be breaking some laws with this"
-	  * Allan O: "This is getting out of hand; I may have to cease development of TextMate"
-	  * Steve J: "This puts a ding in the universe"
-	//-->
-</div>
-
-<script type="text/javascript">
-var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
-document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
-</script>
-<script type="text/javascript">
-var pageTracker = _gat._getTracker("UA-567811-10");
-pageTracker._initData();
-pageTracker._trackPageview();
-</script>
-</body>
-</html>
diff --git a/bundles/ruby-on-rails.tmbundle/website/demo.txt b/bundles/ruby-on-rails.tmbundle/website/demo.txt
deleted file mode 100644
index 37d3c383a..000000000
--- a/bundles/ruby-on-rails.tmbundle/website/demo.txt
+++ /dev/null
@@ -1,738 +0,0 @@
-h1. Step-by-step demonstration
-
-In this demo we'll create a blog; because that's what blogs are for: being
-demonstrations of web frameworks.
-
-The demonstration uses new features of Rails 2.0 and the snippets in this bundle.
-
-h2. A New App
-
-<pre>rails blog
-cd blog
-mate .</pre>
-
-h2. Add some models
-
-<pre>ruby script/generate model Post subject:string body:text</pre>
-
-This creates a 001_create_posts migration with a create_table:
-
-<pre syntax="ruby">create_table :posts do |t|
-  t.string :subject
-  t.text :body
-
-  t.timestamps
-end</pre>
-
-h2. Sexy Migration support
-
-If you put the cursor on the line after <code>t.text :body</code>, type <code>t.</code> and press TAB. Select "Create boolean column" (by pressing 0), and type "published" into the template field. If nothing happened when you pressed TAB, check that when you opened the migrations file you've selected the bundle "Ruby on Rails".
-
-Note that another <code>t.</code> was created on the next line! Press TAB and the cursor will be placed after it. You can now press TAB again to create another column, or delete this line.
-
-Here, delete the extraneous <code>t.</code> line (CONTROL SHIFT K). And save the file (COMMAND S).
-
-Run the migrations, either from the prompt:
-
-    rake db:migrate
-
-or directly from the editor with CONTROL | (Ctrl-Pipeline), and choosing option "Migrate to Current".
-
-
-h2. Post fixtures
-
-Update the <code>test/fixtures/posts.yml</code> file as:
-
-<pre syntax="yaml">published:
-  subject: Some article
-  body: A test article
-  published: true
-
-nonpublished:
-  body: Still writing this one</pre>
-
-Note, in Rails 2.0 fixtures no longer have explicit ids. Later on we'll look at snippets for using Foxy Fixtures with auto-completion for associations.
-
-h2. Public blog controller
-
-Create a controller for our blog, either via the command prompt:
-
-    ruby script/generate controller blog
-
-or directly from the editor with CONTROL |, and choosing option "Call Generate Script", choose "Controller", give it the name "blog", and empty the list of actions.
-
-Now open <code>blog_controller_test.rb</code>. To find this file quickly press COMMAND T, type <code>bct</code>, and select the file.
-
-Note how much cleaner functional tests are now via <code>ActionController::TestCase</code>.
-
-Let's do some TDD. First, delete the <code>test_truth</code> dummy method.
-
-To create a test to show a list of blog articles:
-
-    deftg
-
-and TAB gives:
-
-<pre syntax="ruby">def test_should_get_action
-  @model = models(:fixture_name)
-  get :action, :id => @model.to_param
-  assert_response :success
-
-end</pre>
-
-Type <code>index</code> to replace <code>action</code>. Press TAB, and then BACKSPACE to remove the first line, then press TAB three times and then BACKSPACE to remove the <code>:id => @model.to_param</code> part. The press TAB again to go to the end of the method. Now we have:
-
-<pre syntax="ruby">def test_should_get_index
-  get :index
-  assert_response :success
-
-end</pre>
-
-Now type <code>asg</code>, press TAB, and type <code>posts</code>, and press TAB again. This creates an instance variable lookup within an assertion:
-
-<pre syntax="ruby">assert(posts = assigns(:posts), "Cannot find @posts")</pre>
-
-Now, let's assert the HTML format.
-
-Type <code>ass</code> and press TAB. Type <code>div#posts</code>, press TAB and BACKSPACE, then TAB twice to place the cursor within the <code>assert_select</code> block:
-
-<pre syntax="ruby">assert_select 'div#posts' do
-
-end</pre>
-
-Now we'll check that the <code>@posts</code> objects are represented in the <code>div#posts</code> element.
-
-With the cursor inside the <code>assert_select</code>:
-
-Type <code>ass</code>, press TAB, type <code>div.post</code>, press TAB twice, and type <code>count</code> (to replace the <code>text</code>). Now press TAB again, and type <code>posts.size</code>. Press TAB a final time (it will highlight the <code>do...end</code> block), and press BACKSPACE.
-
-Our test method is now finished:
-
-<pre syntax="ruby">def test_should_get_index
-  get :index
-  assert_response :success
-  assert(posts = assigns(:posts), "Cannot find @posts")
-  assert_select 'div#posts' do
-    assert_select 'div.post', :count => posts.size
-  end
-end</pre>
-
-NOTE: there is also a <code>deftp</code> snippet for functional tests to create a POST test stub.
-To memorize: <code>deftg</code> stands for <code>define test get</code> and <code>deftp</code> stands for <code>define test post</code>
-
-h2. Controller actions
-
-To navigate to <code>blog_controller.rb</code> there are three options:
-
-* press SHIFT OPTION COMMAND DOWN, and select "Controller" from the drop-down list
-* press OPTION COMMAND DOWN and you'll go directly to the controller (toggles between the two files)
-* press COMMAND T, type <code>bc</code>, choose the file, press RETURN.
-
-Add the <code>index</code> action method:
-
-<pre syntax="ruby">def index
-  @posts = Post.find_all_by_published(true)
-end</pre>
-
-h2. Action views
-
-To create/navigate to the view, press SHIFT OPTION COMMAND DOWN and select "View" (like above). Or press OPTION COMMAND DOWN to toggle between a controller method and it's view.
-
-As there are no <code>app/views/blog/index*</code> files, it will prompt you to create a blank view file. By default it guesses <code>index.html.erb</code> (because the method was named <code>index</code>), but of course you can change that in the dialog box.
-
-If instead you got the message "blog_controller.rb does not have a view", note that you first need to save the controller file before hitting SHIFT OPTION COMMAND DOWN or OPTION COMMAND DOWN. Also note that the cursor must be within the scope of a method for SHIFT OPTION COMMAND DOWN or OPTION COMMAND DOWN to work.
-
-Press enter to accept <code>index.html.erb</code>. You are taken to the new file.
-
-Let's create HTML to match the earlier tests.
-
-Type <code>div</code> and press TAB twice, then type <code>posts</code> and press TAB:
-
-<pre syntax="html"><div id="posts">
-
-</div></pre>
-
-Inside the <code>div</code> element, type <code>for</code> and press TAB. This expands into a large ERb-enabled for-loop. Type <code>@posts</code>, press TAB, type <code>post</code> and press TAB. The cursor is now inside the for-loop.
-
-Inside the for-loop, type: <code>div</code> and press TAB. Press BACKSPACE, and type <code> class='post'</code> and press TAB to enter the <code>div</code> element.
-
-Create a <code><%=  %></code> element (CONTROL >). If you press CONTROL > again, it toggles to <code><%  %></code>, and then again and it becomes <code><%-  -%></code>, and again and it becomes <code><%#  %></code> (a Ruby comment). Pressing CONTROL > again starts at <code><%=  %></code> again.
-
-Enter <code>post.body</code> within the ERb template field.
-
-Actually, we'll need to show the subject too, so above the <code><%= post.body %></code> line (press UP followed by COMMAND RETURN)
-type 'h3', and press CONTROL < (LessThan), then CONTROL > (GreatherThan), and <code>post.subject</code>.
-
-The resulting line is: <code><h3><%= post.subject %></h3></code>
-
-Move the cursor down between <code><% else %></code> and <code><% end %></code>.
-
-Create a simple element <code><p></p></code> (CONTROL SHIFT W or CONTROL <). You can change the element type here. Just press TAB to go inside the element. Type <code>There are no posts available to read. All y'all come back soon, yer hear.</code> because its funny.
-
-Our <code>index.html.erb</code> template is now:
-
-<pre syntax="html"><div id="posts">
-  <% if !@posts.blank? %>
-    <% for post in @posts %>
-      <div class="post">
-        <h3><%= post.subject %></h3>
-        <%= post.body %>
-      </div>
-    <% end %>
-  <% else %>
-    <p>There are no posts available to read. All y'all come back soon, yer hear.</p>
-  <% end %>
-
-</div></pre>
-
-If we run our functional tests they now pass: run either from the command prompt with <code>rake test:functionals</code> or directly from the editor by pressing CONTROL \ and press 2 for "Test Functionals"
-
-As yet, we have no way for users to leave comments.
-
-h2. Foxy Fixtures
-
-Create a comment model:
-
-    ruby script/generate model Comment body:text name:string post:references
-
-Note: here <code>post:references</code> is effectively the same as <code>post_id:integer</code>. Within the generated migration it creates <code>t.reference :post</code>. There is also a <code>t.</code> and <code>tcr</code> snippet for references, as for other standard datatypes, which helps setup polymorphic associations.
-
-The generated <code>create_table</code> in <code>002_create_comments.rb</code> is:
-
-<pre syntax="ruby">create_table :comments do |t|
-  t.text :body
-  t.string :name
-  t.references :post
-
-  t.timestamps
-end</pre>
-
-Run <code>rake db:migrate</code>, or directly from the editor with CONTROL | and choose option "Migrate to Current".
-
-Now create some comment fixtures so we can look at Foxy Fixtures. Open <code>text/fixtures/comments.yml</code> (COMMAND T, type <code>cy</code>, press RETURN).
-
-By default, the generated <code>comments.yml</code> starts like:
-
-<pre>one:
-  body: MyText
-  name: MyString
-  post:
-
-two:
-  body: MyText
-  name: MyString
-  post:</pre>
-
-The <code>post</code> fields replace the rails1.2 <code>post_id</code> fields. Now, we can specify the <code>post.yml</code> labels for a post. From above we have <code>published</code> and <code>unpublished</code>. It can be hard to remember what fixtures we have, so there is a key-combo helper.
-
-Put the cursor after <code>post:</code> and press OPTION ESCAPE. A drop-down box appears with the names of the <code>posts.yml</code> fixtures. Select <code>published</code> and press RETURN. Repeat for the 2nd fixture. This gives us:
-
-<pre>one:
-  body: MyText
-  name: MyString
-  post: published
-
-two:
-  body: MyText
-  name: MyString
-  post: published</pre>
-
-h2. Associations
-
-To enable the Foxy Fixtures, we need to add associations to the model classes.
-
-You can now quickly go from a fixtures file (we're in comments.yml) to the model file (SHIFT OPTION COMMAND DOWN).
-
-Within <code>comment.rb</code> model, create a new line within the class, and type <code>bt</code> and press TAB. Type <code>post</code>. This creates a snippet:
-
-<pre syntax="ruby">belongs_to :post, :class_name => "Post", :foreign_key => "post_id"</pre>
-
-The class name and foreign key are now generated from the association name. You can change them by tabbing across. But, we only need the default, so we can delete these options.
-
-Press TAB and BACKSPACE to remove the <code>:class_name</code> and <code>:foreign_key</code> options. The <code>Comment</code> class is now:
-
-<pre syntax="ruby">class Comment < ActiveRecord::Base
-  belongs_to :post
-end</pre>
-
-Now go to the <code>Post</code> class. Press COMMAND T and type <code>post</code> and select the model file, and press RETURN.
-
-Create a new line within the <code>Post</code> class (COMMAND RETURN). Type <code>hm</code> and press TAB to generate a <code>has_many</code> association. Type <code>comment</code>, and the resulting snippet is:
-
-<pre syntax="ruby">has_many :comments, :class_name => "comment", :foreign_key => "class_name_id"</pre>
-
-We don't need the options. So press TAB once and then BACKSPACE.
-
-<pre syntax="ruby">class Post < ActiveRecord::Base
-  has_many :comments
-end</pre>
-
-Note: there is also a <code>has_many :through</code> snippet. Type <code>hmt</code> and TAB to activate it.
-
-Finally, we can run our tests since adding the <code>Comment</code> model + fixtures (CONTROL \).
-
-<pre>rake test</pre>
-
-h2. Routes
-
-Open the routes file (COMMAND T, type <code>routes</code> and press RETURN).
-
-Change the routes file to:
-
-<pre syntax="ruby">ActionController::Routing::Routes.draw do |map|
-  map.resources :posts
-  map.connect ':controller/:action/:id'
-  map.connect ':controller/:action/:id.:format'
-end</pre>
-
-h2. Creating Posts
-
-From the <code>Post</code> model class (<code>post.rb</code>) you can now quickly navigate to a controller
-of the same name. It supports either singular or plural controller names, but
-will default to the plural name, which is the REST/resources preferred name.
-
-To create a <code>PostsController</code>, use the 'Go To' hot key (as above) SHIFT OPTION COMMAND DOWN and select 'Controller'. As there is no <code>post_controller.rb</code> nor <code>posts_controller.rb</code> it will create a <code>posts_controller.rb</code> controller file; which is what we want here.
-
-Note; at this stage you could use the Rails 2.0 <code>scaffold</code> generator to create the <code>posts_controller.rb</code> (and tests and routes).
-
-In the blank file, we need to create a controller class.
-
-Type <code>cla</code> and TAB, and select "Create controller class". Type <code>Posts</code> and TAB,
-<code>post</code> and TAB, and finally, <code>Post</code> and TAB. This leaves the cursor in the middle
-of the generated class:
-
-<pre syntax="ruby">class PostsController < ApplicationController
-  before_filter :find_post
-
-
-
-  private
-  def find_post
-    @post = Post.find(params[:id]) if params[:id]
-  end
-end</pre>
-
-h2. TDD for Posts controller
-
-Currently there is not a functional test for our <code>posts_controller.rb</code>. To create it, use the 'Go To' hot key (SHIFT OPTION COMMAND DOWN) and select 'Functional Test'. This will create a blank file.
-
-Type <code>cla</code> and TAB, and select "Create functional test class".
-Type <code>Posts</code> and TAB. (The functional test class name
-should match the controller class, with <code>Test</code> suffixed to it).
-
-The functional test class snippet gives you a <code>deft</code> stub. If you
-press TAB now, it creates a generic test method snippet:
-
-<pre syntax="ruby">def test_case_name
-
-end</pre>
-
-Instead, we will use the <code>deftg</code> (GET request) and <code>deftp</code> (POST request) snippets.
-
-Create a test for the <code>index</code>, <code>new</code> and <code>edit</code> actions. For <code>index</code> and <code>new</code>, we can delete the <code>@model = models(:fixture_name)</code>,
-etc parts.
-
-To test for the <code>create</code> action, type <code>deftp</code> and TAB. Type <code>create</code> and TAB, type <code>post</code> and TAB, type BACKSPACE and TAB, and again BACKSPACE and TAB. Now enter in a hash of the values to pass in for the test, say <code>:subject => 'Test', :body => 'Some body', :published => '1'</code>. The result should look like:
-
-<pre syntax="ruby">def test_should_post_create
-  post :create, :post => { :subject => 'Test', :body => 'Some body', :published => '1' }
-  assert_response :redirect
-
-end</pre>
-
-On the line after the <code>assert_response</code> expression, we'll test
-for where we want to be redirected to.
-
-If you type <code>art</code> you create an old-style <code>assert_redirected_to :action => "index"</code>
-snippet.
-
-In addition there are now various <code>assert_redirected_to</code> snippets that
-use resourceful routes:
-
-* artp   - <code>assert_redirected_to model_path(@model)</code>
-* artpp  - <code>assert_redirected_to models_path</code>
-* artnp  - <code>assert_redirected_to parent_child_path(@parent, @child)</code>
-* artnpp - <code>assert_redirected_to parent_child_path(@parent)</code>
-
-As we'll see later, this naming scheme is used for other snippets that
-use resourceful routes, like <code>link_to</code> and <code>redirect_to</code>.
-
-Type <code>artpp</code> and TAB, and type <code>post</code>, to assert that the <code>create</code>
-action must redirect to the index page.
-
-The final <code>test_should_post_create</code> method is:
-
-<pre syntax="ruby">def test_should_post_create
-  post :create, :post => { :subject => 'Test', :body => 'Some body', :published => '1' }
-  assert_response :redirect
-  assert_redirected_to posts_path
-end</pre>
-
-Running our tests (<code>rake test:functionals</code> or CONTROL \) shows all these new tests failing.
-
-h2. Views
-
-Go back to the <code>posts_controller.rb</code> file (OPTION COMMAND DOWN).
-
-Now add three actions - <code>index</code>, <code>new</code> and <code>edit</code>. New methods can be created
-with the <code>def</code> snippet:
-
-<pre syntax="ruby">class PostsController < ApplicationController
-  before_filter :find_post
-
-  def index
-    @posts = Post.find(:all)
-  end
-
-  def new
-    @post = Post.new
-  end
-
-  def edit
-  end
-
-  private
-  def find_post
-    @post = Post.find(params[:id]) if params[:id]
-  end
-end</pre>
-
-Note: the <code>index</code> method could be created by typing <code>def</code>, TAB, <code>index</code>, TAB,  <code>@posts = Post.fina</code>, TAB, BACKSPACE.
-
-Now we need templates for the <code>index</code>, <code>new</code> and <code>edit</code> actions.
-
-Place the cursor inside the <code>index</code> method,
-and use the 'Go To' hot key (SHIFT OPTION COMMAND DOWN)
-and select 'View'. A dialog box will pop up asking for the name of the new
-template (as there are no <code>app/views/posts/index*</code> files). By default, the
-suffix is now <code>.html.erb</code> rather than the old <code>.rhtml</code>. Press RETURN,
-to accept <code>index.html.erb</code> as your template name.
-
-Let's just create a simple table showing the Posts.
-
-Type <code>table</code> and CONTROL < to generate <code><table></table></code>, and
-press RETURN to put the tags on separate lines.
-
-Do the same to create a <code><tbody></tbody></code> element.
-
-Inside the <code><tbody></tbody></code> we want to iterate over the <code>@posts</code>,
-one per <code><tr></tr></code> row.
-
-Press CONTROL >, three times, to create a <code><%- -%></code> tag. Inside it
-type <code>@posts.each do |post|</code>.
-
-On the next line (COMMAND RETURN), type <code>end</code> and TAB, to create <code><% end -%></code>.
-We now have a Ruby block within this ERb template.
-
-Inside the block, create a <code><tr></tr></code> element, and within it
-create a <code><td></td></code> element. We'll skip over anything fancy
-here, and just put the post's subject here.
-
-Type <code>post.subject</code> and select it. Now press CONTROL > to wrap
-the selected text inside <code><%= post.subject %></code>.
-
-The resulting <code>index.html.erb</code> is:
-
-<pre syntax="html"><table>
-  <tbody>
-    <%- @posts.each do |post| -%>
-      <tr>
-        <td><%= post.subject %></td>
-      </tr>
-    <% end -%>
-  </tbody>
-</table></pre>
-
-h2. Forms
-
-Place the cursor inside the <code>new</code> method,
-and use the 'Go To' hot key (SHIFT OPTION COMMAND DOWN)
-and select 'View'. Press RETURN to accept <code>new.html.erb</code>.
-
-Inside the blank <code>new.html.erb</code> file, type <code>ffe</code> and press TAB, and type <code>post</code>
-and press TAB twice:
-
-<pre syntax="html"><%= error_messages_for :post %>
-<% form_for @post do |f| -%>
-
-<% end -%></pre>
-
-<code>form_for</code> is the Rails 2.0 preferred helper for managing forms, and
-there are now snippets for common form_for helpers. There are <code>ff</code> and <code>ffe</code>
-snippets; the former does not have the error messages section.
-
-To create a label and text field for the <code>subject</code> attribute:
-
-Create a <code><p></p></code> block (Press CONTROL <, then TAB, then RETURN).
-Type <code>f.</code> and TAB, and select "Label". Type <code>subject</code>, press TAB and press BACKSPACE.
-Create a <code><br /></code> (CONTROL RETURN).
-Type <code>f.</code> and TAB, and select "Text Field". Type <code>subject</code>.
-
-This gives us:
-
-<pre syntax="html"><%= error_messages_for :post %>
-<% form_for @post do |f| -%>
-  <p>
-    <%= f.label :subject %><br />
-    <%= f.text_field :subject %>
-  </p>
-<% end -%></pre>
-
-Now repeat for <code>body</code> and <code>published</code> fields.
-
-Note, for <code>published</code>, you might change the label to <code>Published yet?</code> by tabbing
-into the default string file.
-
-Finally, add a "Submit" button using the <code>f.</code> snippet tab completion.
-
-Start <code>script/server</code> from the prompt and you can now view this form at [http://localhost:3000/posts/new](http://localhost:3000/posts/new)
-
-The final form is:
-
-<pre syntax="html"><%= error_messages_for :post %>
-<% form_for @post do |f| -%>
-  <p>
-    <%= f.label :subject %><br />
-    <%= f.text_field :subject %>
-  </p>
-  <p>
-    <%= f.label :body %><br />
-    <%= f.text_area :body %>
-  </p>
-  <p>
-    <%= f.label :published, "Published yet?" %><br />
-    <%= f.check_box :published %>
-  </p>
-  <p>
-    <%= f.submit "Submit" %>
-  </p>
-<% end -%></pre>
-
-Note: if you got <code><br></code> when hitting CONTROL RETURN instead of <code><br /></code> then you might want to go to the preferences of TextMate (COMMAND ,), choose tab "Advanced", choose "Shell Variables", click the + sign to add a new shell variable, and give it the name <code>TM_XHTML</code> and a value of <code> /</code>
-
-h2. Partials
-
-The form we just created is exactly the same as the form required for the <code>edit.html.erb</code> template.
-
-Instead of copy+pasting it into the <code>edit.html.erb</code> file, we'll create a partial
-template.
-
-Select the entire form (COMMAND A), and press CONTROL SHIFT H and a dialog box appears.
-Type in <code>form</code> and press RETURN.
-
-You'll notice a new file <code>_form.html.erb</code> has appeared which contains the code you had selected,
-while the code in the file <code>new.html.erb</code> has been replaced by:
-
-    <%= render :partial => 'form' %>
-
-Now copy and paste this into the <code>edit.html.erb</code> file. To create this file,
-return to the controller (from the <code>new.html.erb</code> file, press OPTION COMMAND DOWN), go to the <code>edit</code> action,
-and use OPTION COMMAND DOWN again to create the <code>edit.html.erb</code> template file.
-
-h2. Link helpers
-
-At the bottom of the <code>new.html.erb</code> we want a link back to the list of all posts
-(within the posts controller, not the public blog controller). This
-will be the <code>index</code> action, and will be accessible via the resources route
-<code>posts_path</code>.
-
-There are several <code>link_to</code> snippets that support the resources routes:
-
-* lip   - <code><%= link_to "link text...", model_path(@model) %></code>
-* lipp  - <code><%= link_to "link text...", models_path %></code>
-* linp  - <code><%= link_to "link text...", parent_child_path(@parent, @child) %></code>
-* linpp - <code><%= link_to "link text...", parent_child_path(@parent) %></code>
-* lim   - <code><%= link_to model.name, model_path(model) %></code>
-
-The tab stop points are in useful places.
-
-So, to create our link to the posts page, type <code>lipp</code> and TAB, type
-<code>Show all posts</code>, press TAB twice and type <code>post</code>.
-
-h2. Controllers: <code>respond_to</code> and <code>redirect_to</code>
-
-Now we'll add a <code>create</code> action to the <code>posts_controller.rb</code>. Let's go there (OPTION COMMAND DOWN).
-
-Below the <code>edit</code> method type <code>def</code> and TAB, and type
-<code>create</code> and TAB. Now fill out the <code>create</code> action like:
-
-<pre syntax="ruby">def create
-  @post = Post.new(params[:post])
-  if @post.save
-
-  else
-
-  end
-end</pre>
-
-Place the cursor in the <code>true</code> section of the <code>if</code> statement.
-Type <code>repp</code> and TAB to create a <code>redirect_to</code> expression. Press TAB
-again and replace the selected text with <code>post</code>.
-
-Like the various <code>link_to</code> snippets, there are matching <code>redirect_to</code>
-snippets.
-
-* rep   - <code>redirect_to(model_path(@model))</code>
-* repp  - <code>redirect_to(models_path)</code>
-* renp  - <code>redirect_to(parent_child_path(@parent, @child))</code>
-* renpp - <code>redirect_to(parent_child_path(@parent))</code>
-
-There are tab stops in useful places.
-
-In the <code>false</code> section of the <code>if</code> expression, we'll demonstrate the
-<code>respond_to</code> block. There are two ways to generate a <code>respond_to</code> block.
-
-Type <code>rest</code> and TAB, and you get a standard empty block you can work with:
-
-<pre syntax="ruby">respond_to do |wants|
-  wants.html {  }
-end</pre>
-
-Press TAB twice to get inside the <code>wants.html</code> block, type <code>ra</code>, press TAB, then type <code>new</code>. The final block is:
-
-<pre syntax="ruby">respond_to do |wants|
-  wants.html { render :action => "new" }
-end</pre>
-
-Alternately, there is the "upgrade" hot key (SHIFT COMMAND H), where you can convert some
-existing selected code, into a <code>respond_to</code> block.
-
-Select the whole line containing the <code>redirect_to</code> expression from the
-<code>true</code> section of the <code>if</code> statement (SHIFT COMMAND L).
-
-Press SHIFT COMMAND H and the line is replaced with:
-
-<pre syntax="ruby">respond_to do |wants|
-  wants.html do
-    redirect_to(posts_path)
-  end
-  wants.js {  }
-end</pre>
-
-The <code>js</code> is the first tab stop. The point of this hot key is to instantly
-refactor your existing html respond code, and support a second response
-format.
-
-For now remove the line with <code>wants.js</code> (CONTROL SHIFT K).
-
-The completed <code>create</code> action is:
-
-<pre syntax="ruby">def create
-  @post = Post.new(params[:post])
-  if @post.save
-    respond_to do |wants|
-      wants.html do
-        redirect_to(posts_path)
-      end
-    end
-  else
-    respond_to do |wants|
-      wants.html { render :action => "new" }
-    end
-  end
-end</pre>
-
-Yes you'd probably only have one <code>respond_to</code> block, but this is a
-demo so I am taking the scenic route.
-
-h2. Our application so far
-
-In the browser, we can create posts via [http://localhost:3000/posts/new](http://localhost:3000/posts/new)
-and then view them as a blog visitor at [http://localhost:3000/blog](http://localhost:3000/blog).
-
-h2. Some more migrations
-
-We're looking for the following additions:
-
-* rename the column <code>name</code> of table <code>comments</code> to <code>author</code>
-* add a new column <code>author_url</code> to table <code>comments</code>
-* add an index to the column <code>post_id</code> of the <code>comments</code> table
-
-Let's try to do this all in one migrations file. Start Quick Migration (CONTROL SHIFT M). Let's name it <code>ModifyComments</code>. A new migrations file <code>003_modify_comments.rb</code> is created and opened, and the cursor is placed behind the <code>mtab</code> trigger. For now delete <code>mtab</code> and instead enter <code>mcol</code> and press TAB. Choose <code>Rename / Rename Column</code> (3). Type <code>comments</code> TAB <code>name</code> TAB <code>author</code> TAB RETURN.
-
-Again type <code>mcol</code> and TAB. This time choose <code>Add / Remove Column</code> (1). Type <code>comments</code> TAB <code>author_url</code>, then TAB twice, and press RETURN.
-
-Now type <code>mind</code> and TAB. Choose <code>Add / Remove Index</code> (1). Type <code>comments</code> TAB <code>post_id</code>.
-
-The end result looks like this:
-
-<pre syntax="ruby">class ModifyComments < ActiveRecord::Migration
-  def self.up
-    rename_column :comments, :name, :author
-    add_column :comments, :author_url, :string
-    add_index :comments, :post_id
-  end
-
-  def self.down
-    remove_index :comments, :post_id
-    remove_column :comments, :author_url
-    rename_column :comments, :author, :name
-  end
-end</pre>
-
-Notice how the <code>down</code> method calls are in reversed order of the <code>up</code> method calls.
-
-Save the file (COMMAND S) and migrate to current (CONTROL |).
-
-Be sure to modify the comments fixture file. Go there (COMMAND T, press <code>cy</code>, choose <code>comments.yml</code>). Rename <code>name</code> to <code>author</code> and add a row for <code>author_url</code> for each comment. Check your tests again (CONTROL \, choose option 1). All tests should pass.
-
-Futhermore we'd like to know when a post was published. To do this we'll want the following modifications:
-
-* keep track of the datetime when a post was published.
-* remove the column published from the posts table because it can be determined if a post is published by looking at whether or not a value is present for the published date.
-
-Start Quick Migration (CONTROL SHIFT M). Let's name it <code>AddPublishedAtForPosts</code>. A new migrations file <code>004_add_published_at_for_posts.rb</code> is created and opened, and the cursor is placed behind the <code>mtab</code> trigger. Again delete <code>mtab</code> and instead enter <code>mcol</code> and press TAB. Choose <code>Add / Remove Column</code> (1). Type <code>posts</code> TAB <code>published_at</code> TAB <code>datetime</code> TAB and RETURN.
-
-Again type <code>mcol</code> and TAB. Choose <code>Remove / Add Column</code> (5). Type <code>posts</code> TAB <code>published</code> and press TAB twice.
-
-The end result looks like this:
-
-<pre syntax="ruby">class AddPublishedAtForPosts < ActiveRecord::Migration
-  def self.up
-    add_column :posts, :published_at, :datetime
-    remove_column :posts, :published
-  end
-
-  def self.down
-    add_column :posts, :published, :boolean
-    remove_column :posts, :published_at
-  end
-end</pre>
-
-Notice how the <code>Remove / Add Column</code> command automagically determined in the <code>down</code> method the column type of column <code>published</code> to be a <code>boolean</code>. It determines this by looking at the current state of your <code>db/schema.rb</code> file.
-
-Save the file (COMMAND S) and migrate to current (CONTROL |).
-
-Now we need to modify the posts fixtures file. Go there (COMMAND T, type <code>pyml</code>, choose <code>posts.yml</code>). Replace the line <code>published: true</code> by <code>published_at: 2008-1-1</code>.
-
-Modify the posts functional test, first go there (SHIFT OPTION COMMAND DOWN, choose "Go to Functional Test"). Replace <code>:published => '1'</code> by <code>:published_at => Date.new(2008, 1, 1)</code>.
-
-Modify the post model, first go there (SHIFT OPTION COMMAND DOWN, choose "Go to Model"). Have the code look like:
-
-<pre syntax="ruby">class Post < ActiveRecord::Base
-  has_many :comments
-
-  def published
-    !self.published_at.nil?
-  end
-
-  def published=(publish)
-    if publish
-      self.published_at = DateTime.now if self.published_at.nil?
-    else
-      self.published_at = nil
-    end
-  end
-end</pre>
-
-Modify the <code>blog_controller.rb</code> file. Replace <code>Post.find_all_by_published(true)</code> by <code>Post.find(:all, :conditions => "published_at IS NOT NULL")</code>.
-
-Finally, check your tests again (CONTROL \). All tests should pass.
-
-
-h1. TODO
-
-* Model snippets (validates_...)
-* link_to(model) (ltm)
-* RJS demo
-
diff --git a/bundles/ruby-on-rails.tmbundle/website/images/logo_bundle.png b/bundles/ruby-on-rails.tmbundle/website/images/logo_bundle.png
deleted file mode 100644
index 63babefad7a5c8e1239c5454fe4e0cbdf311f796..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1975
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
JPDHLkV1lo6DK7v3

diff --git a/bundles/ruby-on-rails.tmbundle/website/index.html b/bundles/ruby-on-rails.tmbundle/website/index.html
deleted file mode 100644
index 31c3982c1..000000000
--- a/bundles/ruby-on-rails.tmbundle/website/index.html
+++ /dev/null
@@ -1,99 +0,0 @@
-<!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>
-  <link rel="stylesheet" href="stylesheets/screen.css" type="text/css" media="screen" />
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-  <title>
-      Ruby on Rails.tmbundle
-  </title>
-  <script src="javascripts/rounded_corners_lite.inc.js" type="text/javascript"></script>
-
-  <script type="text/javascript">
-    window.onload = function() {
-      settings = {
-          tl: { radius: 10 },
-          tr: { radius: 10 },
-          bl: { radius: 10 },
-          br: { radius: 10 },
-          antiAlias: true,
-          autoPad: true,
-          validTags: ["div"]
-      }
-      var versionBox = new curvyCorners(settings, document.getElementById("version"));
-      versionBox.applyCornersToAll();
-    }
-  </script>
-</head>
-<body>
-<div id="main">
-	
-    <h1>Ruby on Rails.tmbundle</h1>
-    <div id="version" class="clickable" onclick='document.location = "http://railsbundle.com/dist/JavaScript Unit Testing.tar.gz"; return false'>
-      <p>Get Version</p>
-      <a href="http://railsbundle.com/dist/JavaScript Unit Testing.tar.gz" class="numbers">2.0.0</a>
-      <a href="http://railsbundle.com/dist/JavaScript Unit Testing.tar.gz" class="numbers"><img src="images/logo_bundle.png" width="50" height="51" alt="Logo Bundle" border=0></a>
-    </div>
-    <h2>What</h2>
-
-
-	<p>Using <a href="http://rubyonrails.org">Ruby on Rails</a>? Using <a href="http://macromates.com">TextMate</a>? Here is Rails TextMate bundle, now ready for Rails 2.0.</p>
-
-
-	<h2>Download</h2>
-
-
-	<p><a href="dist/Ruby on Rails.tmbundle.tar.gz"><img src="images/logo_bundle.png" width="50" height="51" alt="Logo Bundle" border=0></a></p>
-
-
-	<p><a href="dist/Ruby on Rails.tmbundle.tar.gz">Ruby on Rails.tmbundle</a></p>
-
-
-	<h2>Forum</h2>
-
-
-	<p><a href="http://groups.google.com/group/rubyonrails-textmate">http://groups.google.com/group/rubyonrails-textmate</a></p>
-
-
-	<h2>How to submit patches</h2>
-
-
-	<p>Read the <a href="http://drnicwilliams.com/2007/06/01/8-steps-for-fixing-other-peoples-code/">8 steps for fixing other people&#8217;s code</a> and for section <a href="http://drnicwilliams.com/2007/06/01/8-steps-for-fixing-other-peoples-code/#8b-google-groups">8b: Submit patch to Google Groups</a>, use the Google Group above.</p>
-
-
-	<p>The source project is a <a href="http://git.or.cz/">Git</a> repository. See Dr Nic&#8217;s <a href="http://github.com/drnic/ruby-on-rails-tmbundle/tree/master">master branch</a> for clone/checkout details.</p>
-
-
-	<h2>License</h2>
-
-
-	<p>This code is free to use under the terms of the <span class="caps">MIT</span> license.</p>
-
-
-	<h2>Contact</h2>
-
-
-	<p>Comments are welcome. Send an email to <a href="mailto:drnicwilliams@gmail.com">Dr Nic Williams</a> via the <a href="http://groups.google.com/group/rubyonrails-textmate">forum</a></p>
-    <p class="coda">
-      <a href="http://drnicwilliams.com">Dr Nic Williams</a>, 27th February 2008<br>
-      Theme extended from <a href="http://rb2js.rubyforge.org/">Paul Battley</a>
-    </p>    
-
-    <!--
-	  * Matt A: "I'm new to this country, but I must be breaking some laws with this"
-	  * Allan O: "This is getting out of hand; I may have to cease development of TextMate"
-	  * Steve J: "This puts a ding in the universe"
-	//-->
-</div>
-
-<script type="text/javascript">
-var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
-document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
-</script>
-<script type="text/javascript">
-var pageTracker = _gat._getTracker("UA-567811-10");
-pageTracker._initData();
-pageTracker._trackPageview();
-</script>
-</body>
-</html>
diff --git a/bundles/ruby-on-rails.tmbundle/website/index.txt b/bundles/ruby-on-rails.tmbundle/website/index.txt
deleted file mode 100644
index 3398c24e8..000000000
--- a/bundles/ruby-on-rails.tmbundle/website/index.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-h1. Ruby on Rails.tmbundle
-
-h2. What
-
-Using "Ruby on Rails":http://rubyonrails.org? Using "TextMate":http://macromates.com? Here is Rails TextMate bundle, now ready for Rails 2.0.
-
-h2. Download
-
-<a href="dist/Ruby on Rails.tmbundle.tar.gz"><img src="images/logo_bundle.png" width="50" height="51" alt="Logo Bundle" border=0></a>
-
-<a href="dist/Ruby on Rails.tmbundle.tar.gz">Ruby on Rails.tmbundle</a>
-
-
-h2. Forum
-
-"http://groups.google.com/group/rubyonrails-textmate":http://groups.google.com/group/rubyonrails-textmate
-
-h2. How to submit patches
-
-Read the "8 steps for fixing other people's code":http://drnicwilliams.com/2007/06/01/8-steps-for-fixing-other-peoples-code/ and for section "8b: Submit patch to Google Groups":http://drnicwilliams.com/2007/06/01/8-steps-for-fixing-other-peoples-code/#8b-google-groups, use the Google Group above.
-
-The source project is a "Git":http://git.or.cz/ repository. See Dr Nic's "master branch":http://github.com/drnic/ruby-on-rails-tmbundle/tree/master for clone/checkout details.
-
-h2. License
-
-This code is free to use under the terms of the MIT license. 
-
-h2. Contact
-
-Comments are welcome. Send an email to "Dr Nic Williams":mailto:drnicwilliams@gmail.com via the "forum":http://groups.google.com/group/rubyonrails-textmate
-
diff --git a/bundles/ruby-on-rails.tmbundle/website/javascripts/rounded_corners_lite.inc.js b/bundles/ruby-on-rails.tmbundle/website/javascripts/rounded_corners_lite.inc.js
deleted file mode 100644
index afc3ea327..000000000
--- a/bundles/ruby-on-rails.tmbundle/website/javascripts/rounded_corners_lite.inc.js
+++ /dev/null
@@ -1,285 +0,0 @@
-
- /****************************************************************
-  *                                                              *
-  *  curvyCorners                                                *
-  *  ------------                                                *
-  *                                                              *
-  *  This script generates rounded corners for your divs.        *
-  *                                                              *
-  *  Version 1.2.9                                               *
-  *  Copyright (c) 2006 Cameron Cooke                            *
-  *  By: Cameron Cooke and Tim Hutchison.                        *
-  *                                                              *
-  *                                                              *
-  *  Website: http://www.curvycorners.net                        *
-  *  Email:   info@totalinfinity.com                             *
-  *  Forum:   http://www.curvycorners.net/forum/                 *
-  *                                                              *
-  *                                                              *
-  *  This library is free software; you can redistribute         *
-  *  it and/or modify it under the terms of the GNU              *
-  *  Lesser General Public License as published by the           *
-  *  Free Software Foundation; either version 2.1 of the         *
-  *  License, or (at your option) any later version.             *
-  *                                                              *
-  *  This library is distributed in the hope that it will        *
-  *  be useful, but WITHOUT ANY WARRANTY; without even the       *
-  *  implied warranty of MERCHANTABILITY or FITNESS FOR A        *
-  *  PARTICULAR PURPOSE. See the GNU Lesser General Public       *
-  *  License for more details.                                   *
-  *                                                              *
-  *  You should have received a copy of the GNU Lesser           *
-  *  General Public License along with this library;             *
-  *  Inc., 59 Temple Place, Suite 330, Boston,                   *
-  *  MA 02111-1307 USA                                           *
-  *                                                              *
-  ****************************************************************/
-  
-var isIE = navigator.userAgent.toLowerCase().indexOf("msie") > -1; var isMoz = document.implementation && document.implementation.createDocument; var isSafari = ((navigator.userAgent.toLowerCase().indexOf('safari')!=-1)&&(navigator.userAgent.toLowerCase().indexOf('mac')!=-1))?true:false; function curvyCorners()
-{ if(typeof(arguments[0]) != "object") throw newCurvyError("First parameter of curvyCorners() must be an object."); if(typeof(arguments[1]) != "object" && typeof(arguments[1]) != "string") throw newCurvyError("Second parameter of curvyCorners() must be an object or a class name."); if(typeof(arguments[1]) == "string")
-{ var startIndex = 0; var boxCol = getElementsByClass(arguments[1]);}
-else
-{ var startIndex = 1; var boxCol = arguments;}
-var curvyCornersCol = new Array(); if(arguments[0].validTags)
-var validElements = arguments[0].validTags; else
-var validElements = ["div"]; for(var i = startIndex, j = boxCol.length; i < j; i++)
-{ var currentTag = boxCol[i].tagName.toLowerCase(); if(inArray(validElements, currentTag) !== false)
-{ curvyCornersCol[curvyCornersCol.length] = new curvyObject(arguments[0], boxCol[i]);}
-}
-this.objects = curvyCornersCol; this.applyCornersToAll = function()
-{ for(var x = 0, k = this.objects.length; x < k; x++)
-{ this.objects[x].applyCorners();}
-}
-}
-function curvyObject()
-{ this.box = arguments[1]; this.settings = arguments[0]; this.topContainer = null; this.bottomContainer = null; this.masterCorners = new Array(); this.contentDIV = null; var boxHeight = get_style(this.box, "height", "height"); var boxWidth = get_style(this.box, "width", "width"); var borderWidth = get_style(this.box, "borderTopWidth", "border-top-width"); var borderColour = get_style(this.box, "borderTopColor", "border-top-color"); var boxColour = get_style(this.box, "backgroundColor", "background-color"); var backgroundImage = get_style(this.box, "backgroundImage", "background-image"); var boxPosition = get_style(this.box, "position", "position"); var boxPadding = get_style(this.box, "paddingTop", "padding-top"); this.boxHeight = parseInt(((boxHeight != "" && boxHeight != "auto" && boxHeight.indexOf("%") == -1)? boxHeight.substring(0, boxHeight.indexOf("px")) : this.box.scrollHeight)); this.boxWidth = parseInt(((boxWidth != "" && boxWidth != "auto" && boxWidth.indexOf("%") == -1)? boxWidth.substring(0, boxWidth.indexOf("px")) : this.box.scrollWidth)); this.borderWidth = parseInt(((borderWidth != "" && borderWidth.indexOf("px") !== -1)? borderWidth.slice(0, borderWidth.indexOf("px")) : 0)); this.boxColour = format_colour(boxColour); this.boxPadding = parseInt(((boxPadding != "" && boxPadding.indexOf("px") !== -1)? boxPadding.slice(0, boxPadding.indexOf("px")) : 0)); this.borderColour = format_colour(borderColour); this.borderString = this.borderWidth + "px" + " solid " + this.borderColour; this.backgroundImage = ((backgroundImage != "none")? backgroundImage : ""); this.boxContent = this.box.innerHTML; if(boxPosition != "absolute") this.box.style.position = "relative"; this.box.style.padding = "0px"; if(isIE && boxWidth == "auto" && boxHeight == "auto") this.box.style.width = "100%"; if(this.settings.autoPad == true && this.boxPadding > 0)
-this.box.innerHTML = ""; this.applyCorners = function()
-{ for(var t = 0; t < 2; t++)
-{ switch(t)
-{ case 0:
-if(this.settings.tl || this.settings.tr)
-{ var newMainContainer = document.createElement("DIV"); newMainContainer.style.width = "100%"; newMainContainer.style.fontSize = "1px"; newMainContainer.style.overflow = "hidden"; newMainContainer.style.position = "absolute"; newMainContainer.style.paddingLeft = this.borderWidth + "px"; newMainContainer.style.paddingRight = this.borderWidth + "px"; var topMaxRadius = Math.max(this.settings.tl ? this.settings.tl.radius : 0, this.settings.tr ? this.settings.tr.radius : 0); newMainContainer.style.height = topMaxRadius + "px"; newMainContainer.style.top = 0 - topMaxRadius + "px"; newMainContainer.style.left = 0 - this.borderWidth + "px"; this.topContainer = this.box.appendChild(newMainContainer);}
-break; case 1:
-if(this.settings.bl || this.settings.br)
-{ var newMainContainer = document.createElement("DIV"); newMainContainer.style.width = "100%"; newMainContainer.style.fontSize = "1px"; newMainContainer.style.overflow = "hidden"; newMainContainer.style.position = "absolute"; newMainContainer.style.paddingLeft = this.borderWidth + "px"; newMainContainer.style.paddingRight = this.borderWidth + "px"; var botMaxRadius = Math.max(this.settings.bl ? this.settings.bl.radius : 0, this.settings.br ? this.settings.br.radius : 0); newMainContainer.style.height = botMaxRadius + "px"; newMainContainer.style.bottom = 0 - botMaxRadius + "px"; newMainContainer.style.left = 0 - this.borderWidth + "px"; this.bottomContainer = this.box.appendChild(newMainContainer);}
-break;}
-}
-if(this.topContainer) this.box.style.borderTopWidth = "0px"; if(this.bottomContainer) this.box.style.borderBottomWidth = "0px"; var corners = ["tr", "tl", "br", "bl"]; for(var i in corners)
-{ if(i > -1 < 4)
-{ var cc = corners[i]; if(!this.settings[cc])
-{ if(((cc == "tr" || cc == "tl") && this.topContainer != null) || ((cc == "br" || cc == "bl") && this.bottomContainer != null))
-{ var newCorner = document.createElement("DIV"); newCorner.style.position = "relative"; newCorner.style.fontSize = "1px"; newCorner.style.overflow = "hidden"; if(this.backgroundImage == "")
-newCorner.style.backgroundColor = this.boxColour; else
-newCorner.style.backgroundImage = this.backgroundImage; switch(cc)
-{ case "tl":
-newCorner.style.height = topMaxRadius - this.borderWidth + "px"; newCorner.style.marginRight = this.settings.tr.radius - (this.borderWidth*2) + "px"; newCorner.style.borderLeft = this.borderString; newCorner.style.borderTop = this.borderString; newCorner.style.left = -this.borderWidth + "px"; break; case "tr":
-newCorner.style.height = topMaxRadius - this.borderWidth + "px"; newCorner.style.marginLeft = this.settings.tl.radius - (this.borderWidth*2) + "px"; newCorner.style.borderRight = this.borderString; newCorner.style.borderTop = this.borderString; newCorner.style.backgroundPosition = "-" + (topMaxRadius + this.borderWidth) + "px 0px"; newCorner.style.left = this.borderWidth + "px"; break; case "bl":
-newCorner.style.height = botMaxRadius - this.borderWidth + "px"; newCorner.style.marginRight = this.settings.br.radius - (this.borderWidth*2) + "px"; newCorner.style.borderLeft = this.borderString; newCorner.style.borderBottom = this.borderString; newCorner.style.left = -this.borderWidth + "px"; newCorner.style.backgroundPosition = "-" + (this.borderWidth) + "px -" + (this.boxHeight + (botMaxRadius + this.borderWidth)) + "px"; break; case "br":
-newCorner.style.height = botMaxRadius - this.borderWidth + "px"; newCorner.style.marginLeft = this.settings.bl.radius - (this.borderWidth*2) + "px"; newCorner.style.borderRight = this.borderString; newCorner.style.borderBottom = this.borderString; newCorner.style.left = this.borderWidth + "px"
-newCorner.style.backgroundPosition = "-" + (botMaxRadius + this.borderWidth) + "px -" + (this.boxHeight + (botMaxRadius + this.borderWidth)) + "px"; break;}
-}
-}
-else
-{ if(this.masterCorners[this.settings[cc].radius])
-{ var newCorner = this.masterCorners[this.settings[cc].radius].cloneNode(true);}
-else
-{ var newCorner = document.createElement("DIV"); newCorner.style.height = this.settings[cc].radius + "px"; newCorner.style.width = this.settings[cc].radius + "px"; newCorner.style.position = "absolute"; newCorner.style.fontSize = "1px"; newCorner.style.overflow = "hidden"; var borderRadius = parseInt(this.settings[cc].radius - this.borderWidth); for(var intx = 0, j = this.settings[cc].radius; intx < j; intx++)
-{ if((intx +1) >= borderRadius)
-var y1 = -1; else
-var y1 = (Math.floor(Math.sqrt(Math.pow(borderRadius, 2) - Math.pow((intx+1), 2))) - 1); if(borderRadius != j)
-{ if((intx) >= borderRadius)
-var y2 = -1; else
-var y2 = Math.ceil(Math.sqrt(Math.pow(borderRadius,2) - Math.pow(intx, 2))); if((intx+1) >= j)
-var y3 = -1; else
-var y3 = (Math.floor(Math.sqrt(Math.pow(j ,2) - Math.pow((intx+1), 2))) - 1);}
-if((intx) >= j)
-var y4 = -1; else
-var y4 = Math.ceil(Math.sqrt(Math.pow(j ,2) - Math.pow(intx, 2))); if(y1 > -1) this.drawPixel(intx, 0, this.boxColour, 100, (y1+1), newCorner, -1, this.settings[cc].radius); if(borderRadius != j)
-{ for(var inty = (y1 + 1); inty < y2; inty++)
-{ if(this.settings.antiAlias)
-{ if(this.backgroundImage != "")
-{ var borderFract = (pixelFraction(intx, inty, borderRadius) * 100); if(borderFract < 30)
-{ this.drawPixel(intx, inty, this.borderColour, 100, 1, newCorner, 0, this.settings[cc].radius);}
-else
-{ this.drawPixel(intx, inty, this.borderColour, 100, 1, newCorner, -1, this.settings[cc].radius);}
-}
-else
-{ var pixelcolour = BlendColour(this.boxColour, this.borderColour, pixelFraction(intx, inty, borderRadius)); this.drawPixel(intx, inty, pixelcolour, 100, 1, newCorner, 0, this.settings[cc].radius, cc);}
-}
-}
-if(this.settings.antiAlias)
-{ if(y3 >= y2)
-{ if (y2 == -1) y2 = 0; this.drawPixel(intx, y2, this.borderColour, 100, (y3 - y2 + 1), newCorner, 0, 0);}
-}
-else
-{ if(y3 >= y1)
-{ this.drawPixel(intx, (y1 + 1), this.borderColour, 100, (y3 - y1), newCorner, 0, 0);}
-}
-var outsideColour = this.borderColour;}
-else
-{ var outsideColour = this.boxColour; var y3 = y1;}
-if(this.settings.antiAlias)
-{ for(var inty = (y3 + 1); inty < y4; inty++)
-{ this.drawPixel(intx, inty, outsideColour, (pixelFraction(intx, inty , j) * 100), 1, newCorner, ((this.borderWidth > 0)? 0 : -1), this.settings[cc].radius);}
-}
-}
-this.masterCorners[this.settings[cc].radius] = newCorner.cloneNode(true);}
-if(cc != "br")
-{ for(var t = 0, k = newCorner.childNodes.length; t < k; t++)
-{ var pixelBar = newCorner.childNodes[t]; var pixelBarTop = parseInt(pixelBar.style.top.substring(0, pixelBar.style.top.indexOf("px"))); var pixelBarLeft = parseInt(pixelBar.style.left.substring(0, pixelBar.style.left.indexOf("px"))); var pixelBarHeight = parseInt(pixelBar.style.height.substring(0, pixelBar.style.height.indexOf("px"))); if(cc == "tl" || cc == "bl"){ pixelBar.style.left = this.settings[cc].radius -pixelBarLeft -1 + "px";}
-if(cc == "tr" || cc == "tl"){ pixelBar.style.top = this.settings[cc].radius -pixelBarHeight -pixelBarTop + "px";}
-switch(cc)
-{ case "tr":
-pixelBar.style.backgroundPosition = "-" + Math.abs((this.boxWidth - this.settings[cc].radius + this.borderWidth) + pixelBarLeft) + "px -" + Math.abs(this.settings[cc].radius -pixelBarHeight -pixelBarTop - this.borderWidth) + "px"; break; case "tl":
-pixelBar.style.backgroundPosition = "-" + Math.abs((this.settings[cc].radius -pixelBarLeft -1) - this.borderWidth) + "px -" + Math.abs(this.settings[cc].radius -pixelBarHeight -pixelBarTop - this.borderWidth) + "px"; break; case "bl":
-pixelBar.style.backgroundPosition = "-" + Math.abs((this.settings[cc].radius -pixelBarLeft -1) - this.borderWidth) + "px -" + Math.abs((this.boxHeight + this.settings[cc].radius + pixelBarTop) -this.borderWidth) + "px"; break;}
-}
-}
-}
-if(newCorner)
-{ switch(cc)
-{ case "tl":
-if(newCorner.style.position == "absolute") newCorner.style.top = "0px"; if(newCorner.style.position == "absolute") newCorner.style.left = "0px"; if(this.topContainer) this.topContainer.appendChild(newCorner); break; case "tr":
-if(newCorner.style.position == "absolute") newCorner.style.top = "0px"; if(newCorner.style.position == "absolute") newCorner.style.right = "0px"; if(this.topContainer) this.topContainer.appendChild(newCorner); break; case "bl":
-if(newCorner.style.position == "absolute") newCorner.style.bottom = "0px"; if(newCorner.style.position == "absolute") newCorner.style.left = "0px"; if(this.bottomContainer) this.bottomContainer.appendChild(newCorner); break; case "br":
-if(newCorner.style.position == "absolute") newCorner.style.bottom = "0px"; if(newCorner.style.position == "absolute") newCorner.style.right = "0px"; if(this.bottomContainer) this.bottomContainer.appendChild(newCorner); break;}
-}
-}
-}
-var radiusDiff = new Array(); radiusDiff["t"] = Math.abs(this.settings.tl.radius - this.settings.tr.radius)
-radiusDiff["b"] = Math.abs(this.settings.bl.radius - this.settings.br.radius); for(z in radiusDiff)
-{ if(z == "t" || z == "b")
-{ if(radiusDiff[z])
-{ var smallerCornerType = ((this.settings[z + "l"].radius < this.settings[z + "r"].radius)? z +"l" : z +"r"); var newFiller = document.createElement("DIV"); newFiller.style.height = radiusDiff[z] + "px"; newFiller.style.width = this.settings[smallerCornerType].radius+ "px"
-newFiller.style.position = "absolute"; newFiller.style.fontSize = "1px"; newFiller.style.overflow = "hidden"; newFiller.style.backgroundColor = this.boxColour; switch(smallerCornerType)
-{ case "tl":
-newFiller.style.bottom = "0px"; newFiller.style.left = "0px"; newFiller.style.borderLeft = this.borderString; this.topContainer.appendChild(newFiller); break; case "tr":
-newFiller.style.bottom = "0px"; newFiller.style.right = "0px"; newFiller.style.borderRight = this.borderString; this.topContainer.appendChild(newFiller); break; case "bl":
-newFiller.style.top = "0px"; newFiller.style.left = "0px"; newFiller.style.borderLeft = this.borderString; this.bottomContainer.appendChild(newFiller); break; case "br":
-newFiller.style.top = "0px"; newFiller.style.right = "0px"; newFiller.style.borderRight = this.borderString; this.bottomContainer.appendChild(newFiller); break;}
-}
-var newFillerBar = document.createElement("DIV"); newFillerBar.style.position = "relative"; newFillerBar.style.fontSize = "1px"; newFillerBar.style.overflow = "hidden"; newFillerBar.style.backgroundColor = this.boxColour; newFillerBar.style.backgroundImage = this.backgroundImage; switch(z)
-{ case "t":
-if(this.topContainer)
-{ if(this.settings.tl.radius && this.settings.tr.radius)
-{ newFillerBar.style.height = topMaxRadius - this.borderWidth + "px"; newFillerBar.style.marginLeft = this.settings.tl.radius - this.borderWidth + "px"; newFillerBar.style.marginRight = this.settings.tr.radius - this.borderWidth + "px"; newFillerBar.style.borderTop = this.borderString; if(this.backgroundImage != "")
-newFillerBar.style.backgroundPosition = "-" + (topMaxRadius + this.borderWidth) + "px 0px"; this.topContainer.appendChild(newFillerBar);}
-this.box.style.backgroundPosition = "0px -" + (topMaxRadius - this.borderWidth) + "px";}
-break; case "b":
-if(this.bottomContainer)
-{ if(this.settings.bl.radius && this.settings.br.radius)
-{ newFillerBar.style.height = botMaxRadius - this.borderWidth + "px"; newFillerBar.style.marginLeft = this.settings.bl.radius - this.borderWidth + "px"; newFillerBar.style.marginRight = this.settings.br.radius - this.borderWidth + "px"; newFillerBar.style.borderBottom = this.borderString; if(this.backgroundImage != "")
-newFillerBar.style.backgroundPosition = "-" + (botMaxRadius + this.borderWidth) + "px -" + (this.boxHeight + (topMaxRadius + this.borderWidth)) + "px"; this.bottomContainer.appendChild(newFillerBar);}
-}
-break;}
-}
-}
-if(this.settings.autoPad == true && this.boxPadding > 0)
-{ var contentContainer = document.createElement("DIV"); contentContainer.style.position = "relative"; contentContainer.innerHTML = this.boxContent; contentContainer.className = "autoPadDiv"; var topPadding = Math.abs(topMaxRadius - this.boxPadding); var botPadding = Math.abs(botMaxRadius - this.boxPadding); if(topMaxRadius < this.boxPadding)
-contentContainer.style.paddingTop = topPadding + "px"; if(botMaxRadius < this.boxPadding)
-contentContainer.style.paddingBottom = botMaxRadius + "px"; contentContainer.style.paddingLeft = this.boxPadding + "px"; contentContainer.style.paddingRight = this.boxPadding + "px"; this.contentDIV = this.box.appendChild(contentContainer);}
-}
-this.drawPixel = function(intx, inty, colour, transAmount, height, newCorner, image, cornerRadius)
-{ var pixel = document.createElement("DIV"); pixel.style.height = height + "px"; pixel.style.width = "1px"; pixel.style.position = "absolute"; pixel.style.fontSize = "1px"; pixel.style.overflow = "hidden"; var topMaxRadius = Math.max(this.settings["tr"].radius, this.settings["tl"].radius); if(image == -1 && this.backgroundImage != "")
-{ pixel.style.backgroundImage = this.backgroundImage; pixel.style.backgroundPosition = "-" + (this.boxWidth - (cornerRadius - intx) + this.borderWidth) + "px -" + ((this.boxHeight + topMaxRadius + inty) -this.borderWidth) + "px";}
-else
-{ pixel.style.backgroundColor = colour;}
-if (transAmount != 100)
-setOpacity(pixel, transAmount); pixel.style.top = inty + "px"; pixel.style.left = intx + "px"; newCorner.appendChild(pixel);}
-}
-function insertAfter(parent, node, referenceNode)
-{ parent.insertBefore(node, referenceNode.nextSibling);}
-function BlendColour(Col1, Col2, Col1Fraction)
-{ var red1 = parseInt(Col1.substr(1,2),16); var green1 = parseInt(Col1.substr(3,2),16); var blue1 = parseInt(Col1.substr(5,2),16); var red2 = parseInt(Col2.substr(1,2),16); var green2 = parseInt(Col2.substr(3,2),16); var blue2 = parseInt(Col2.substr(5,2),16); if(Col1Fraction > 1 || Col1Fraction < 0) Col1Fraction = 1; var endRed = Math.round((red1 * Col1Fraction) + (red2 * (1 - Col1Fraction))); if(endRed > 255) endRed = 255; if(endRed < 0) endRed = 0; var endGreen = Math.round((green1 * Col1Fraction) + (green2 * (1 - Col1Fraction))); if(endGreen > 255) endGreen = 255; if(endGreen < 0) endGreen = 0; var endBlue = Math.round((blue1 * Col1Fraction) + (blue2 * (1 - Col1Fraction))); if(endBlue > 255) endBlue = 255; if(endBlue < 0) endBlue = 0; return "#" + IntToHex(endRed)+ IntToHex(endGreen)+ IntToHex(endBlue);}
-function IntToHex(strNum)
-{ base = strNum / 16; rem = strNum % 16; base = base - (rem / 16); baseS = MakeHex(base); remS = MakeHex(rem); return baseS + '' + remS;}
-function MakeHex(x)
-{ if((x >= 0) && (x <= 9))
-{ return x;}
-else
-{ switch(x)
-{ case 10: return "A"; case 11: return "B"; case 12: return "C"; case 13: return "D"; case 14: return "E"; case 15: return "F";}
-}
-}
-function pixelFraction(x, y, r)
-{ var pixelfraction = 0; var xvalues = new Array(1); var yvalues = new Array(1); var point = 0; var whatsides = ""; var intersect = Math.sqrt((Math.pow(r,2) - Math.pow(x,2))); if ((intersect >= y) && (intersect < (y+1)))
-{ whatsides = "Left"; xvalues[point] = 0; yvalues[point] = intersect - y; point = point + 1;}
-var intersect = Math.sqrt((Math.pow(r,2) - Math.pow(y+1,2))); if ((intersect >= x) && (intersect < (x+1)))
-{ whatsides = whatsides + "Top"; xvalues[point] = intersect - x; yvalues[point] = 1; point = point + 1;}
-var intersect = Math.sqrt((Math.pow(r,2) - Math.pow(x+1,2))); if ((intersect >= y) && (intersect < (y+1)))
-{ whatsides = whatsides + "Right"; xvalues[point] = 1; yvalues[point] = intersect - y; point = point + 1;}
-var intersect = Math.sqrt((Math.pow(r,2) - Math.pow(y,2))); if ((intersect >= x) && (intersect < (x+1)))
-{ whatsides = whatsides + "Bottom"; xvalues[point] = intersect - x; yvalues[point] = 0;}
-switch (whatsides)
-{ case "LeftRight":
-pixelfraction = Math.min(yvalues[0],yvalues[1]) + ((Math.max(yvalues[0],yvalues[1]) - Math.min(yvalues[0],yvalues[1]))/2); break; case "TopRight":
-pixelfraction = 1-(((1-xvalues[0])*(1-yvalues[1]))/2); break; case "TopBottom":
-pixelfraction = Math.min(xvalues[0],xvalues[1]) + ((Math.max(xvalues[0],xvalues[1]) - Math.min(xvalues[0],xvalues[1]))/2); break; case "LeftBottom":
-pixelfraction = (yvalues[0]*xvalues[1])/2; break; default:
-pixelfraction = 1;}
-return pixelfraction;}
-function rgb2Hex(rgbColour)
-{ try{ var rgbArray = rgb2Array(rgbColour); var red = parseInt(rgbArray[0]); var green = parseInt(rgbArray[1]); var blue = parseInt(rgbArray[2]); var hexColour = "#" + IntToHex(red) + IntToHex(green) + IntToHex(blue);}
-catch(e){ alert("There was an error converting the RGB value to Hexadecimal in function rgb2Hex");}
-return hexColour;}
-function rgb2Array(rgbColour)
-{ var rgbValues = rgbColour.substring(4, rgbColour.indexOf(")")); var rgbArray = rgbValues.split(", "); return rgbArray;}
-function setOpacity(obj, opacity)
-{ opacity = (opacity == 100)?99.999:opacity; if(isSafari && obj.tagName != "IFRAME")
-{ var rgbArray = rgb2Array(obj.style.backgroundColor); var red = parseInt(rgbArray[0]); var green = parseInt(rgbArray[1]); var blue = parseInt(rgbArray[2]); obj.style.backgroundColor = "rgba(" + red + ", " + green + ", " + blue + ", " + opacity/100 + ")";}
-else if(typeof(obj.style.opacity) != "undefined")
-{ obj.style.opacity = opacity/100;}
-else if(typeof(obj.style.MozOpacity) != "undefined")
-{ obj.style.MozOpacity = opacity/100;}
-else if(typeof(obj.style.filter) != "undefined")
-{ obj.style.filter = "alpha(opacity:" + opacity + ")";}
-else if(typeof(obj.style.KHTMLOpacity) != "undefined")
-{ obj.style.KHTMLOpacity = opacity/100;}
-}
-function inArray(array, value)
-{ for(var i = 0; i < array.length; i++){ if (array[i] === value) return i;}
-return false;}
-function inArrayKey(array, value)
-{ for(key in array){ if(key === value) return true;}
-return false;}
-function addEvent(elm, evType, fn, useCapture) { if (elm.addEventListener) { elm.addEventListener(evType, fn, useCapture); return true;}
-else if (elm.attachEvent) { var r = elm.attachEvent('on' + evType, fn); return r;}
-else { elm['on' + evType] = fn;}
-}
-function removeEvent(obj, evType, fn, useCapture){ if (obj.removeEventListener){ obj.removeEventListener(evType, fn, useCapture); return true;} else if (obj.detachEvent){ var r = obj.detachEvent("on"+evType, fn); return r;} else { alert("Handler could not be removed");}
-}
-function format_colour(colour)
-{ var returnColour = "#ffffff"; if(colour != "" && colour != "transparent")
-{ if(colour.substr(0, 3) == "rgb")
-{ returnColour = rgb2Hex(colour);}
-else if(colour.length == 4)
-{ returnColour = "#" + colour.substring(1, 2) + colour.substring(1, 2) + colour.substring(2, 3) + colour.substring(2, 3) + colour.substring(3, 4) + colour.substring(3, 4);}
-else
-{ returnColour = colour;}
-}
-return returnColour;}
-function get_style(obj, property, propertyNS)
-{ try
-{ if(obj.currentStyle)
-{ var returnVal = eval("obj.currentStyle." + property);}
-else
-{ if(isSafari && obj.style.display == "none")
-{ obj.style.display = ""; var wasHidden = true;}
-var returnVal = document.defaultView.getComputedStyle(obj, '').getPropertyValue(propertyNS); if(isSafari && wasHidden)
-{ obj.style.display = "none";}
-}
-}
-catch(e)
-{ }
-return returnVal;}
-function getElementsByClass(searchClass, node, tag)
-{ var classElements = new Array(); if(node == null)
-node = document; if(tag == null)
-tag = '*'; var els = node.getElementsByTagName(tag); var elsLen = els.length; var pattern = new RegExp("(^|\s)"+searchClass+"(\s|$)"); for (i = 0, j = 0; i < elsLen; i++)
-{ if(pattern.test(els[i].className))
-{ classElements[j] = els[i]; j++;}
-}
-return classElements;}
-function newCurvyError(errorMessage)
-{ return new Error("curvyCorners Error:\n" + errorMessage)
-}
diff --git a/bundles/ruby-on-rails.tmbundle/website/peepcode.html b/bundles/ruby-on-rails.tmbundle/website/peepcode.html
deleted file mode 100644
index 96a35ec65..000000000
--- a/bundles/ruby-on-rails.tmbundle/website/peepcode.html
+++ /dev/null
@@ -1,520 +0,0 @@
-<!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>
-  <link rel="stylesheet" href="stylesheets/screen.css" type="text/css" media="screen" />
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-  <title>
-      Peepcode Script
-  </title>
-  <script src="javascripts/rounded_corners_lite.inc.js" type="text/javascript"></script>
-
-  <script type="text/javascript">
-    window.onload = function() {
-      settings = {
-          tl: { radius: 10 },
-          tr: { radius: 10 },
-          bl: { radius: 10 },
-          br: { radius: 10 },
-          antiAlias: true,
-          autoPad: true,
-          validTags: ["div"]
-      }
-      var versionBox = new curvyCorners(settings, document.getElementById("version"));
-      versionBox.applyCornersToAll();
-    }
-  </script>
-</head>
-<body>
-<div id="main">
-	
-    <h1>Peepcode Script</h1>
-    <div id="version" class="clickable" onclick='document.location = "http://railsbundle.com/dist/JavaScript Unit Testing.tar.gz"; return false'>
-      <p>Get Version</p>
-      <a href="http://railsbundle.com/dist/JavaScript Unit Testing.tar.gz" class="numbers">2.0.0</a>
-      <a href="http://railsbundle.com/dist/JavaScript Unit Testing.tar.gz" class="numbers"><img src="images/logo_bundle.png" width="50" height="51" alt="Logo Bundle" border=0></a>
-    </div>
-    <h2>Introduction</h2>
-
-
-	<p>Many many people&#8217;s first introduction to Ruby on Rails was the 15 minute video from <span class="caps">DHH</span> showing how you create a blog application with Rails. Nearly everyone finished that video asking one question: what was that editor? It is awesome.</p>
-
-
-	<p>Let&#8217;s take a stroll down memory lane. We pick up the action at the X minute mark:</p>
-
-
-	<p>[transition into a portion of the video that shows off TMs features, plus <span class="caps">DHH</span> saying &#8220;Whooops!&#8221;]</p>
-
-
-	<p>What is interesting, is that as fast as David is able to write his blog application, even with his detour demonstrating the now deleted scaffold command, he never uses any special TextMate extensions for Rails. He uses some <span class="caps">HTML</span> snippets and commands and some Ruby snippets and commands. The original Ruby on Rails extensions were in their infancy.</p>
-
-
-	<p>[Open Bundle Editor] A collection of TextMate extensions is called a &#8220;bundle&#8221;.</p>
-
-
-	<p>When working with Rails with TextMate you&#8217;ll use several <a href="</p">bundles</a>&gt;
-
-
-	<ul>
-	<li><span class="caps">HTML</span></li>
-		<li>Ruby</li>
-		<li>Ruby on Rails</li>
-		<li>JavaScript</li>
-	</ul>
-
-
-	<p>You might also use the ProtoType, jQuery or other JavaScript bundle if you use those libraries.</p>
-
-
-Ruby on Rails 2.0 was recently released and includes many improvements to
-	<ul>
-	<li>the syntax that you type [<code>redirect_to :action =&gt; 'show', :id =&gt; @person</code> became <code>redirect_to @person</code>]</li>
-		<li>changes to some file extensions [rhtml -&gt; html.erb] and</li>
-		<li>changes to some file name conventions [user_controller.rb -&gt; users_controller.rb, more commonly].</li>
-	</ul>
-
-
-	<p>The Ruby on Rails bundle has also been given a major upgrade to match all the changes for developing Rails 2.0 applications.</p>
-
-
-	<p>The snippets and commands we&#8217;re going to look at are actually described across all three bundles. Often it is the Rails bundle that reuses the <span class="caps">HTML</span> and Ruby bundles. For example, in an <span class="caps">HTML</span> file you have a variety of ways to create new elements. [examples] Within an html.erb file you can reuse all the same snippets and commands.</p>
-
-
-	<h2>Know thy Editor</h2>
-
-
-	<p>Overview key icons (see PeepCode TM video)</p>
-
-
-	<p>Preferences &gt; Advanced &gt; Folder References &gt; Folder Patterns: add &#8216;vendor/rails&#8217; and it will ignore that folder in any project &#8211; both from the Dock and from Search.</p>
-
-
-	<p>Access your bundles via Ctrl+Alt+Cmd+B.</p>
-
-
-	<p>Quick menu: Ctrl+Esc</p>
-
-
-	<p>Change language for a file, e.g. Ruby &lt;&#8212;&gt; Ruby on Rails. Either click the &#8220;L&#8221; section of the status bar and select the Language; or learn the Language shortcut. These always start with Shift+Alt+Cmd with a letter. Typically the letter is the first letter of the Language. So to choose either Ruby or Ruby on Rails, use Shift+Alt+Cmd+R and choose the language from the drop-down.</p>
-
-
-	<h2>Models and Migrations</h2>
-
-
-	<ul>
-	<li>Create new app</li>
-		<li>Go to app/controllers/application.rb (need a Ruby on Rails file)</li>
-		<li><sup>| + 1 &#8211; Call Generate Script &#8211; create new model &#8220;Post&#8221;  <span class="caps">TODO</span> &#8211; not working @ moment
-  <span class="caps">OR CLI</span>:script/generate model Post title:string</li>
-		<li>Go to migration file: Cmd+T + 001</li>
-		<li>t. &#8211; list of available sexy migration columns; when selecting one, another t. is automatically created for you. (create body:text + published:boolean)</li>
-		<li>Shft+</sup>+K &#8211; remove a line</li>
-		<li><span class="caps">CLI</span>:script/generate model Comment</li>
-		<li>Cmd+T + 002 &#8211; comment migration + add t.references :post, body:text, name:string</li>
-		<li>Ctrl+| + 3 &#8211; run migrations
-  * See error?
-  * In terminal, go to &#8221;/Applications/TextMate.app/Contents/SharedSupport/Support/lib&#8221; and rename/remove Builder.rb
-  * Run migrations again</li>
-	</ul>
-
-
-	<ul>
-	<li>Go to post.rb
-  * hm + comments; notice you can tab across to change fields if required
-  * Also, hmt -&gt; for has_many :through*</li>
-		<li>Go to comments.rb
-  * bt + post; notice the autocompletions are correct here, but still optional for rails so can be deleted
-  * vp + name, body
-  * [Ctrl-Esc -&gt; Models] All the validations are available as snippets based on the first letter of each word.</li>
-		<li>Place the cursor on &#8216;Comment&#8217; class name, Sft+Ctrl+Cmd+S -&gt; shows schema for this class. Alternately, place it on &#8216;post&#8217; to get the schema for Post class.</li>
-	</ul>
-
-
-	<h2>Testing</h2>
-
-
-	<p>I&#8217;ll talk more about navigating between files in a Rails application later, but for the moment, know that there is a special relationship between a model file and a unit test file. You can toggle between them with Alt+Cmd+DownArrow.</p>
-
-
-	<p>The Rails generator for models created this unit test file and a fixtures file.</p>
-
-
-	<p>First, let&#8217;s set up some fixtures for posts and comments. Go to posts.yml and create a &#8220;published&#8221; and a &#8220;unpublished&#8221; fixture. Now go to comments.yml &#8211; using Ctrl+Cmd+R to show posts.yml in the dock.</p>
-
-
-	<p><span class="caps">TODO</span> &#8211; how to move focus from editor to dock?</p>
-
-
-	<p>Within comments, create one comment:</p>
-
-
-<pre>valid:
-  name: Dr Nic
-  body: Cool post
-  post:</pre>
-
-	<p>With Rails 2.0, your fixture ids are no longer required, and you can use Foxy Fixtures to select an associated fixture. Here we&#8217;d type &#8216;published&#8217; to reference that posts.yml fixture. But, since the column name is &#8216;post&#8217; we can get a drop-down list using Alt+Esc. We&#8217;ll use this same fixture autocompletion feature again within the test files.</p>
-
-
-	<p>Back to the comments unit test, and that dummy test needs removing.</p>
-
-
-	<p>Create a new test method with <code>deft</code> + <code>should_require_title</code>.</p>
-
-
-	<p>Type <code>posts(:)</code> and Alt+Esc to access the fixtures autocompletion. You can now select a posts.yml fixture. Note, the current implementation replaces the whole line, so if you need multiple or want a different instance variable you&#8217;ll need to make some manual changes.</p>
-
-
-	<p>Finished:</p>
-
-
-	<p><pre class='syntax'><span class="keyword">def </span><span class="method">test_should_require_title</span>
-  <span class="attribute">@post</span> <span class="punct">=</span> <span class="ident">posts</span><span class="punct">(</span><span class="symbol">:published</span><span class="punct">)</span>
-  <span class="attribute">@comment</span> <span class="punct">=</span> <span class="attribute">@post</span><span class="punct">.</span><span class="ident">comments</span><span class="punct">.</span><span class="ident">create</span>
-  <span class="attribute">@comment</span><span class="punct">.</span><span class="ident">valid?</span>
-  <span class="ident">assert</span><span class="punct">(</span><span class="attribute">@comment</span><span class="punct">.</span><span class="ident">errors</span><span class="punct">[</span><span class="symbol">:name</span><span class="punct">],</span> <span class="punct">&quot;</span><span class="string">Should be errors for name field</span><span class="punct">&quot;)</span>
-<span class="keyword">end</span></pre></p>
-
-
-	<p>To run your unit tests, Ctrl-\ + &#8216;Test Units&#8217; or &#8216;Test Recent&#8217;.</p>
-
-
-	<p>In order to write some functional tests for our blog, let&#8217;s generate a controller as it generates the functional test at the same time. [Ctrl-|] We won&#8217;t specify any actions for the moment, and we&#8217;ll clean away the open windows for the controller and the helper.</p>
-
-
-	<p>For now, let&#8217;s write some functional tests. [remove the test_truth method]</p>
-
-
-	<h3>Diagram</h3>
-
-
-	<ul>
-	<li>deftg -&gt; test <span class="caps">GET</span> action</li>
-		<li>deftp -&gt; test <span class="caps">POST</span> action</li>
-	</ul>
-
-
-	<p>Since many functional tests start with the same setup, there are two functional test snippets to write tests faster. The last letter maps the the http method to be used for the test: g for <span class="caps">GET</span> and p for <span class="caps">POST</span>.</p>
-
-
-	<p>To create a test for the index action, use <code>deftg + 'index'</code>. Then delete the two optional @model sections.</p>
-
-
-	<p>Next, to load an instance variable into the test, type <code>asg + 'posts'</code></p>
-
-
-	<p>Now, let&#8217;s assert the <span class="caps">HTML</span> format.</p>
-
-
-	<p>Type <code>ass</code> and press &#x21E5;. Type <code>div#posts</code>, press &#x21E5; and &#x2326;, then &#x21E5; twice to place the cursor within the <code>assert_select</code> block:</p>
-
-
-	<p><pre class='syntax'><span class="ident">assert_select</span> <span class="punct">'</span><span class="string">div#posts</span><span class="punct">'</span> <span class="keyword">do</span>
-
-<span class="keyword">end</span></pre></p>
-
-
-	<p>Now we&#8217;ll check that the <code>@posts</code> objects are represented in the <code>div#posts</code> element.</p>
-
-
-	<p>With the cursor inside the <code>assert_select</code>:</p>
-
-
-	<p>Type <code>ass</code>, press &#x21E5;, type <code>div.post</code>, press &#x21E5;, press &#x21E5; again, and type <code>count</code> (to replace the <code>text</code>). Now press &#x21E5; again, and type <code>@posts.size</code>. Press &#x21E5; a final time (it will highlight the <code>do...end</code> block), and press &#x2326;.</p>
-
-
-	<p>Our test method is now finished:</p>
-
-
-	<p><pre class='syntax'><span class="keyword">def </span><span class="method">test_should_get_index</span>
-  <span class="ident">get</span> <span class="symbol">:index</span>
-  <span class="ident">assert_response</span> <span class="symbol">:success</span>
-  <span class="ident">assert</span><span class="punct">(</span><span class="ident">posts</span> <span class="punct">=</span> <span class="ident">assigns</span><span class="punct">(</span><span class="symbol">:posts</span><span class="punct">),</span> <span class="punct">&quot;</span><span class="string">Cannot find @posts</span><span class="punct">&quot;)</span>
-  <span class="ident">assert_select</span> <span class="punct">'</span><span class="string">div#posts</span><span class="punct">'</span> <span class="keyword">do</span>
-    <span class="ident">assert_select</span> <span class="punct">'</span><span class="string">div.post</span><span class="punct">',</span> <span class="symbol">:count</span> <span class="punct">=&gt;</span> <span class="ident">posts</span><span class="punct">.</span><span class="ident">size</span>
-  <span class="keyword">end</span>
-<span class="keyword">end</span></pre></p>
-
-
-	<p>Now we create a test for the &#8216;show&#8217; action. Type deftg and &#8216;show&#8217;, and then &#8216;post&#8217;. Then tab into &#8216;fixture_name&#8217; and delete it. Now we&#8217;ll autocomplete on fixtures again. Alt+Esc and select &#8216;published&#8217;.</p>
-
-
-	<p>Now copy the &#8216;div.post&#8217; assert_select line for this test, but change the :count to 1.</p>
-
-
-	<p>To run our functional tests, use Ctrl+\.</p>
-
-
-	<h2>Controllers and Routing</h2>
-
-
-	<p>Similarly to navigating between model and unit test files, you can toggle between functional tests and controllers via Alt+Cmd+DownArrow.</p>
-
-
-	<p>In the controller, type <code>index</code> and use Shift+Enter to convert it to a method. Press BackSpace to delete the arguments.</p>
-
-
-	<p>To load all Posts:</p>
-
-
-	<p><pre class='syntax'><span class="attribute">@posts</span> <span class="punct">=</span> <span class="constant">Post</span><span class="punct">.</span><span class="ident">fina</span></pre></p>
-
-
-	<p>Pressing &#x21E5; creates <code>find(:all, :conditions =&gt; [...])</code>. Tab and change &#8216;field&#8217; to &#8216;published&#8217;.</p>
-
-
-	<h3>Diagram: fina &#8211; find(:all); finf &#8211; find(:first); fini &#8211; find(id); ^-| &#8211; params[:id]</h3>
-
-
-	<p>Now create a &#8216;show&#8217; action, with @post = Post.fini + tab. Use ^-| to insert params[:id].</p>
-
-
-	<p>We&#8217;ll come back and look at views for our index action later. Instead, let&#8217;s create a controller for creating + updating posts for the admin of the site.</p>
-
-
-	<p>We could use the scaffold generator to create a posts controller, with functional tests and default views. Instead, we&#8217;ll build this controller from the ground up.</p>
-
-
-	<h3>Diagram: Navigation between file types</h3>
-
-
-	<p>Shift+Alt+Cmd+DownArrow:</p>
-
-
-	<p><span class="caps">TODO</span> &#8211; finish this</p>
-
-
-	<ul>
-	<li>post.rb -&gt; post_test.rb, posts_controller.rb, etc</li>
-		<li>post_test.rb -&gt; post.rb, posts_controller.rb, etc</li>
-	</ul>
-
-
-	<h3>Diagram: views/users/show.rhtml -&gt; user_controller.rb; views/users/show.html.erb -&gt; users_controller.rb</h3>
-
-
-	<p>One thing to note for developers of Rails apps using older versions of Rails. If you are in a template file with the extension .rhtml, then it will navigate to the singular controller name &#8216;post&#8217;, rather than the plural default for controllers. This is for backwards compatibility with older naming conventions.</p>
-
-
-	<p>So we can create a new <code>posts_controller.rb</code> by returning to the post.rb or post_test.rb files, and navigating to the matching controller. It doesn&#8217;t exist so a blank file is created.</p>
-
-
-	<p>We have a simple way to create new controller classes; the <code>cla</code> snippet has a &#8216;Create controller class&#8217; option. Select that, and type &#8216;Posts&#8217; and then &#8216;post&#8217; to create our posts_controller.rb class.</p>
-
-
-	<p>For simpler actions, use the standard techniques for new methods, def + &#8216;new&#8217; to create the &#8216;new&#8217; method.</p>
-
-
-	<p>For some of the common, more complex controller actions there are also snippets. For the create action, type &#8216;defcreate&#8217; and fill out the template with &#8216;post&#8217;.</p>
-
-
-	<p>What I want the &#8216;create&#8217; action to do is redirect back to the main blog controller for a page. Originally, I could use &#8216;recai&#8217; for <code>redirect_to :controller =&gt; "blog", :action =&gt; "show", :id =&gt; @post</code> but its uncool to use anonymous paths.</p>
-
-
-	<p>So instead let&#8217;s just enter a named route that sounds nice, replace <code>@post</code> with  <code>blog_post_path(@post)</code>.</p>
-
-
-	<p>[Change to the &#8216;routes.rb&#8217; file.] So finally let&#8217;s setup our routes. I&#8217;m going to delete all the default comments and default routes, and reconstruct it with named routes.</p>
-
-
-	<h3>Diagram: Routes: map &#8211; named routes; maprs &#8211; map.resources; mapr &#8211; map.resource; mapwo &#8211; map.with_options</h3>
-
-
-	<p>Within a routes file, you have the three &#8216;map&#8217; snippets. As you&#8217;ll see in moment, the resources snippets include a block for nested resources.</p>
-
-
-	<p>So we&#8217;ll use &#8216;map&#8217; to create named routes. Leave the name as &#8216;connect&#8217; for anonymous routes. It is handy to know a Ruby snippet here: tabbing on colon (:) creates a hash key/value pair.</p>
-
-
-<pre>map.public_page 'blog/show/:id', :controller =&gt; "blog", :action =&gt; "show"</pre>
-
-	<p>We could place this route within a with_options block, using &#8216;mapwo&#8217;. Then add <code>map.root</code> within it.</p>
-
-
-	<p>For our posts controller, we&#8217;ll use the resources snippets. We use &#8216;maprs&#8217; and change &#8216;resource&#8217; to &#8216;posts&#8217; and then we can tab into the block. Say we wanted comments to be a nested resource of posts, then we&#8217;d use &#8216;maprs&#8217; again, and change &#8216;map&#8217; to &#8216;post&#8217; and remove the block. [then delete the comment resource + post&#8217;s block].</p>
-
-
-	<p>There is also a shortcut for the respond_to block &#8211; &#8216;rest&#8217;, which gives a default html response. To add additional response formats, tab on &#8216;wants&#8217;. [remove these examples from new method]</p>
-
-
-	<p>Now let&#8217;s have a final look at functional tests for our create actions, which will require a <span class="caps">POST</span> request. [try to change to functional test] We don&#8217;t have a posts_controller_test.rb, so it creates a blank file for us.</p>
-
-
-	<p>To create a functional test class, use &#8216;cla&#8217; again and select &#8216;Create functional test class&#8217;, and type &#8216;Posts&#8217; for the class name prefix. Save the file, close the window and reopen within the project, otherwise some commands might not work if the file is initially not saved.</p>
-
-
-	<p>Remember that test methods are created with &#8216;deft&#8217;, and the <span class="caps">GET</span> + <span class="caps">POST</span> methods are created with deftg and deftp. Let&#8217;s test our create action with &#8216;deftp&#8217;.</p>
-
-
-	<p>Enter &#8216;post&#8217;, but remove the two optional sections as we&#8217;re creating a new object, not updating an existing object. Within the <code>:post =&gt; {  }</code>, type : and tab to create the hash key values.</p>
-
-
-	<p>Fetch the resulting object with <code>asg</code> + &#8216;post&#8217;.</p>
-
-
-	<p>Add a redirection assertion with <code>artp</code>.</p>
-
-
-	<p><pre class='syntax'><span class="keyword">def </span><span class="method">test_should_post_create</span>
-  <span class="ident">post</span> <span class="symbol">:create</span><span class="punct">,</span> <span class="symbol">:post</span> <span class="punct">=&gt;</span> <span class="punct">{</span> <span class="symbol">:title</span> <span class="punct">=&gt;</span> <span class="punct">&quot;</span><span class="string">hi there</span><span class="punct">&quot;,</span> <span class="symbol">:body</span> <span class="punct">=&gt;</span> <span class="punct">&quot;</span><span class="string">oh yeah</span><span class="punct">&quot;</span> <span class="punct">}</span>
-  <span class="ident">assert_response</span> <span class="symbol">:redirect</span>
-  <span class="ident">assert</span><span class="punct">(</span><span class="ident">post</span> <span class="punct">=</span> <span class="ident">assigns</span><span class="punct">(</span><span class="symbol">:post</span><span class="punct">),</span> <span class="punct">&quot;</span><span class="string">Cannot find @post</span><span class="punct">&quot;)</span>
-
-  <span class="ident">assert_redirected_to</span> <span class="ident">blog_post_path</span><span class="punct">(</span><span class="ident">post</span><span class="punct">)</span>
-<span class="keyword">end</span></pre></p>
-
-
-	<p>If you just want to run the tests in the current file, or in fact run any Ruby file, use Cmd+R. As we can see, this test passes.</p>
-
-
-	<h2>Views</h2>
-
-
-	<p>[back to posts_controller.rb]</p>
-
-
-	<p>In the posts controller, we have a new action but we haven&#8217;t created a template yet. As before, we can use the Navigation cmd to change from the controller to a view. In this case, the view is based on the current method. So we place the cursor in the new method, and it will ask us to create a new.html.erb file. Here is your opportunity to rename the template with alternate format or template extensions, say .xml.builder. But we&#8217;ll use .html.erb for now.</p>
-
-
-	<h3>Diagram: form_for &#8211; ff, form_for with error output &#8211; ffe</h3>
-
-
-	<p>We&#8217;ll use &#8216;ffe&#8217; and enter &#8216;post&#8217;. In Rails 2.0, the form_for helper is very powerful and knows from the object it is passed whether it is creating or updating an object.</p>
-
-
-	<h3>Diagram: f. &#8211; list of available helpers; or use first initial of helpers&#8217; names (fftf &#8211; text_field)</h3>
-
-
-	<p>Inside the form_for block we have two ways to access the common helpers.</p>
-
-
-	<p>By using &#8216;f.&#8217; it reminds us what helpers are available and tells us what their tab completions are.</p>
-
-
-	<p>So, let&#8217;s use the tab completion versions. ffl for label, fftf for text field.</p>
-
-
-<pre>&lt;%= error_messages_for :post %&gt;
-
-&lt;% form_for @post do |f| -%&gt;
-  &lt;%= f.label :title, "Title" %&gt;
-  &lt;%= f.text_field :title %&gt;
-  &lt;%= f.label :body, "Body" %&gt;
-  &lt;%= f.text_area :body, :rows =&gt; 10 %&gt;
-  &lt;%= f.submit "Post", :disable_with =&gt; 'Posting...' %&gt;
-&lt;% end -%&gt;</pre>
-
-	<p>Now let&#8217;s put each label or form field in a separate paragraph. Select those lines and use &#8216;Wrap Each Selected Line in Open/Close&#8217; &#8211; Shift+Ctrl+Cmd+W, and type &#8216;p&#8217;.</p>
-
-
-	<h3>Diagram: Partials &#8211; Shift-Ctrl-H</h3>
-
-
-	<p>Since the form_for helper works with saved and unsaved model objects its easily reusable within new and edit templates. So let&#8217;s extract it as a partial. [do it] And now the render can be pasted into an edit.html.erb file as required.</p>
-
-
-	<p>[go to browser http://localhost:3000/posts/new]
-Now we can fire up the server and have a look at our form and use it. [submit form]</p>
-
-
-	<p>As requested, the browser is redirected to the public post page; which we haven&#8217;t implemented yet. So let&#8217;s do that.</p>
-
-
-	<p>We head back to the blog_controller, and create the show.html.erb via navigating away from the show action.</p>
-
-
-	<p>Create a div and set its class to post, then layout the title and body:</p>
-
-
-<div class="post">
-  <h3>&lt;%= @post.title %&gt;</h3>
-  &lt;%= @post.body %&gt;
-</div>
-
-	<p>If we run our tests, the &#8216;show&#8217; action test is now passing.</p>
-
-
-	<p>[Shft+Ctrl+H] So we can reuse it in the index.html.erb file, let&#8217;s move it to a partial called &#8216;post&#8217; and remove the &#8217;@&#8217; signs to reference a local variable instead of an instance variable.</p>
-
-
-	<p>The returned &#8216;render&#8217; expression isn&#8217;t quite right as we need to pass the @post object into the partial. Let&#8217;s remove it and use the &#8216;render partial&#8217; snippets.</p>
-
-
-	<h3>Diagram: render :partial &#8211; rp; render :partial, :object &#8211; rpo; render :partial, :collection &#8211; rpc; render :partial, :locals &#8211; rpl</h3>
-
-
-	<p>Create &lt;%= %&gt; and inside use &#8216;rpo&#8217; and set the :object =&gt; @post.</p>
-
-
-	<p>Now we create index.html.erb and use &lt;%=  %&gt; with &#8216;rpc&#8217; and &#8216;post&#8217;. The tests require that its wrapped in a div with id=&#8221;posts&#8221;. So select all, and Shift+Ctrl+W + div id=&#8221;posts&#8221;.</p>
-
-
-	<h3>Diagram: Link helpers; lip &#8211; link_to &#8220;label&#8221;, model_path(@model), etc.</h3>
-
-
-	<ul>
-	<li>lip   &#8211; <code>&lt;%= link_to "link text...", model_path(@model) %&gt;</code></li>
-		<li>lipp  &#8211; <code>&lt;%= link_to "link text...", models_path %&gt;</code></li>
-		<li>linp  &#8211; <code>&lt;%= link_to "link text...", parent_child_path(@parent, @child) %&gt;</code></li>
-		<li>linpp &#8211; <code>&lt;%= link_to "link text...", parent_child_path(@parent) %&gt;</code></li>
-		<li>lim   &#8211; <code>&lt;%= link_to model.name, model %&gt;</code></li>
-	</ul>
-
-
-	<h2>Alternate templates</h2>
-
-
-	<h3>Diagram: html.erb, js.erb, js.rjs, xml.builder, xml.erb, html.builder</h3>
-
-
-	<p>In addition to html.erb templates, Rails supports any combination of output format and template engine. As appropriate you can combine html or javascript or xml with erb or rjs or builder, or any other 3rd party templating system such as haml.</p>
-
-
-	<p>The Rails TextMate bundle provides varying support for different combinations.</p>
-
-
-	<h3>Diagram: wants.js -&gt; .js.rjs; wants.xml -&gt; .xml.builder; wants.different -&gt; .different.erb</h3>
-
-
-	<p>Navigation (e.g. tasty tidbit)</p>
-
-
-	<p>Go to posts_controller, add wants.js to create action. Navigate and create posts/create.js.rjs.</p>
-
-
-	<h3>Diagram: <span class="caps">RJS</span> snippets &#8211; hide, insert_html (ins), replace (rep), replace_html (reph), show, toggle (tog), visual_effect (vis)</h3>
-
-
-	<p>All these snippets include the page prefix and are nice ways to start each <span class="caps">RJS</span> expression.</p>
-
-
-	<p>[remove all lines; rename with .erb] Another way to generate JavaScript within Rails is with the .js.erb extension. Instead of <span class="caps">RJS</span> expressions, you write pure JavaScript, but you can embed ruby using erb.</p>
-
-
-	<p>A new syntax supported in the bundle is JavaScript (Rails), which maps to .js.erb files. That is, JavaScript files that permit embedded Ruby. This means, within the &lt;%= %&gt; tags you have access to your Ruby snippets and syntax highlighting.</p>
-
-
-	<h2>Extending</h2>
-    <p class="coda">
-      <a href="http://drnicwilliams.com">Dr Nic Williams</a>, 27th February 2008<br>
-      Theme extended from <a href="http://rb2js.rubyforge.org/">Paul Battley</a>
-    </p>    
-
-    <!--
-	  * Matt A: "I'm new to this country, but I must be breaking some laws with this"
-	  * Allan O: "This is getting out of hand; I may have to cease development of TextMate"
-	  * Steve J: "This puts a ding in the universe"
-	//-->
-</div>
-
-<script type="text/javascript">
-var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
-document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
-</script>
-<script type="text/javascript">
-var pageTracker = _gat._getTracker("UA-567811-10");
-pageTracker._initData();
-pageTracker._trackPageview();
-</script>
-</body>
-</html>
diff --git a/bundles/ruby-on-rails.tmbundle/website/peepcode.txt b/bundles/ruby-on-rails.tmbundle/website/peepcode.txt
deleted file mode 100644
index 7f04499b2..000000000
--- a/bundles/ruby-on-rails.tmbundle/website/peepcode.txt
+++ /dev/null
@@ -1,327 +0,0 @@
-h1. Peepcode Script
-
-h2. Introduction
-
-Many many people's first introduction to Ruby on Rails was the 15 minute video from DHH showing how you create a blog application with Rails. Nearly everyone finished that video asking one question: what was that editor? It is awesome.
-
-Let's take a stroll down memory lane. We pick up the action at the X minute mark:
-
-[transition into a portion of the video that shows off TMs features, plus DHH saying "Whooops!"]
-
-What is interesting, is that as fast as David is able to write his blog application, even with his detour demonstrating the now deleted scaffold command, he never uses any special TextMate extensions for Rails. He uses some HTML snippets and commands and some Ruby snippets and commands. The original Ruby on Rails extensions were in their infancy.
-
-[Open Bundle Editor] A collection of TextMate extensions is called a "bundle".
-
-When working with Rails with TextMate you'll use several "bundles":
-
-* HTML
-* Ruby
-* Ruby on Rails
-* JavaScript
-
-You might also use the ProtoType, jQuery or other JavaScript bundle if you use those libraries.
-
-Ruby on Rails 2.0 was recently released and includes many improvements to
-* the syntax that you type [<code>redirect_to :action => 'show', :id => @person</code> became <code>redirect_to @person</code>]
-* changes to some file extensions [rhtml -> html.erb] and
-* changes to some file name conventions [user_controller.rb -> users_controller.rb, more commonly].
-
-The Ruby on Rails bundle has also been given a major upgrade to match all the changes for developing Rails 2.0 applications.
-
-The snippets and commands we're going to look at are actually described across all three bundles. Often it is the Rails bundle that reuses the HTML and Ruby bundles. For example, in an HTML file you have a variety of ways to create new elements. [examples] Within an html.erb file you can reuse all the same snippets and commands.
-
-
-h2. Know thy Editor
-
-Overview key icons (see PeepCode TM video)
-
-Preferences > Advanced > Folder References > Folder Patterns: add 'vendor/rails' and it will ignore that folder in any project - both from the Dock and from Search.
-
-Access your bundles via Ctrl+Alt+Cmd+B.
-
-Quick menu: Ctrl+Esc
-
-Change language for a file, e.g. Ruby <--> Ruby on Rails. Either click the "L" section of the status bar and select the Language; or learn the Language shortcut. These always start with Shift+Alt+Cmd with a letter. Typically the letter is the first letter of the Language. So to choose either Ruby or Ruby on Rails, use Shift+Alt+Cmd+R and choose the language from the drop-down.
- 
-
-h2. Models and Migrations
-
-* Create new app
-* Go to app/controllers/application.rb (need a Ruby on Rails file)
-* ^| + 1 - Call Generate Script - create new model "Post"  TODO - not working @ moment
-  OR CLI:script/generate model Post title:string
-* Go to migration file: Cmd+T + 001
-* t. - list of available sexy migration columns; when selecting one, another t. is automatically created for you. (create body:text + published:boolean)
-* Shft+^+K - remove a line
-* CLI:script/generate model Comment
-* Cmd+T + 002 - comment migration + add t.references :post, body:text, name:string
-* Ctrl+| + 3 - run migrations
-  * See error?
-  * In terminal, go to "/Applications/TextMate.app/Contents/SharedSupport/Support/lib" and rename/remove Builder.rb
-  * Run migrations again
-
-* Go to post.rb
-  * hm + comments; notice you can tab across to change fields if required
-  * Also, hmt -> for has_many :through*
-* Go to comments.rb
-  * bt + post; notice the autocompletions are correct here, but still optional for rails so can be deleted
-  * vp + name, body
-  * [Ctrl-Esc -> Models] All the validations are available as snippets based on the first letter of each word.
-* Place the cursor on 'Comment' class name, Sft+Ctrl+Cmd+S -> shows schema for this class. Alternately, place it on 'post' to get the schema for Post class.
-
-h2. Testing
-
-I'll talk more about navigating between files in a Rails application later, but for the moment, know that there is a special relationship between a model file and a unit test file. You can toggle between them with Alt+Cmd+DownArrow.
-
-The Rails generator for models created this unit test file and a fixtures file.
-
-First, let's set up some fixtures for posts and comments. Go to posts.yml and create a "published" and a "unpublished" fixture. Now go to comments.yml - using Ctrl+Cmd+R to show posts.yml in the dock.
-
-TODO - how to move focus from editor to dock?
-
-Within comments, create one comment:
-
-<pre>valid:
-  name: Dr Nic
-  body: Cool post
-  post:</pre>
-
-With Rails 2.0, your fixture ids are no longer required, and you can use Foxy Fixtures to select an associated fixture. Here we'd type 'published' to reference that posts.yml fixture. But, since the column name is 'post' we can get a drop-down list using Alt+Esc. We'll use this same fixture autocompletion feature again within the test files.
-
-Back to the comments unit test, and that dummy test needs removing.
-
-Create a new test method with <code>deft</code> + <code>should_require_title</code>.
-
-Type <code>posts(:)</code> and Alt+Esc to access the fixtures autocompletion. You can now select a posts.yml fixture. Note, the current implementation replaces the whole line, so if you need multiple or want a different instance variable you'll need to make some manual changes.
-
-Finished:
-
-<pre syntax="ruby">def test_should_require_title
-  @post = posts(:published)
-  @comment = @post.comments.create
-  @comment.valid?
-  assert(@comment.errors[:name], "Should be errors for name field")
-end</pre>
-
-To run your unit tests, Ctrl-\ + 'Test Units' or 'Test Recent'.
-
-In order to write some functional tests for our blog, let's generate a controller as it generates the functional test at the same time. [Ctrl-|] We won't specify any actions for the moment, and we'll clean away the open windows for the controller and the helper.
-
-For now, let's write some functional tests. [remove the test_truth method]
-
-h3. Diagram
-
-* deftg -> test GET action
-* deftp -> test POST action
-
-Since many functional tests start with the same setup, there are two functional test snippets to write tests faster. The last letter maps the the http method to be used for the test: g for GET and p for POST.
-
-To create a test for the index action, use <code>deftg + 'index'</code>. Then delete the two optional @model sections.
-
-Next, to load an instance variable into the test, type <code>asg + 'posts'</code>
-
-Now, let's assert the HTML format.
-
-Type <code>ass</code> and press TAB. Type <code>div#posts</code>, press TAB and DELETE, then TAB twice to place the cursor within the <code>assert_select</code> block:
-
-<pre syntax="ruby">assert_select 'div#posts' do
-
-end</pre>
-
-Now we'll check that the <code>@posts</code> objects are represented in the <code>div#posts</code> element.
-
-With the cursor inside the <code>assert_select</code>:
-
-Type <code>ass</code>, press TAB, type <code>div.post</code>, press TAB, press TAB again, and type <code>count</code> (to replace the <code>text</code>). Now press TAB again, and type <code>@posts.size</code>. Press TAB a final time (it will highlight the <code>do...end</code> block), and press DELETE.
-
-Our test method is now finished:
-
-<pre syntax="ruby">def test_should_get_index
-  get :index
-  assert_response :success
-  assert(posts = assigns(:posts), "Cannot find @posts")
-  assert_select 'div#posts' do
-    assert_select 'div.post', :count => posts.size
-  end
-end</pre>
-
-Now we create a test for the 'show' action. Type deftg and 'show', and then 'post'. Then tab into 'fixture_name' and delete it. Now we'll autocomplete on fixtures again. Alt+Esc and select 'published'.
-
-Now copy the 'div.post' assert_select line for this test, but change the :count to 1.
-
-To run our functional tests, use Ctrl+\.
-
-h2. Controllers and Routing
-
-Similarly to navigating between model and unit test files, you can toggle between functional tests and controllers via Alt+Cmd+DownArrow.
-
-In the controller, type <code>index</code> and use Shift+Enter to convert it to a method. Press BackSpace to delete the arguments.
-
-To load all Posts:
-
-<pre syntax="ruby">@posts = Post.fina</pre>
-
-Pressing TAB creates <code>find(:all, :conditions => [...])</code>. Tab and change 'field' to 'published'.
-
-h3. Diagram: fina - find(:all); finf - find(:first); fini - find(id); ^-| - params[:id]
-
-Now create a 'show' action, with @post = Post.fini + tab. Use ^-| to insert params[:id].
-
-We'll come back and look at views for our index action later. Instead, let's create a controller for creating + updating posts for the admin of the site.
-
-We could use the scaffold generator to create a posts controller, with functional tests and default views. Instead, we'll build this controller from the ground up.
-
-h3. Diagram: Navigation between file types
-
-Shift+Alt+Cmd+DownArrow:
-
-TODO - finish this
-
-* post.rb -> post_test.rb, posts_controller.rb, etc
-* post_test.rb -> post.rb, posts_controller.rb, etc
-
-h3. Diagram: views/users/show.rhtml -> user_controller.rb; views/users/show.html.erb -> users_controller.rb
-
-One thing to note for developers of Rails apps using older versions of Rails. If you are in a template file with the extension .rhtml, then it will navigate to the singular controller name 'post', rather than the plural default for controllers. This is for backwards compatibility with older naming conventions.
-
-So we can create a new <code>posts_controller.rb</code> by returning to the post.rb or post_test.rb files, and navigating to the matching controller. It doesn't exist so a blank file is created.
-
-We have a simple way to create new controller classes; the <code>cla</code> snippet has a 'Create controller class' option. Select that, and type 'Posts' and then 'post' to create our posts_controller.rb class.
-
-For simpler actions, use the standard techniques for new methods, def + 'new' to create the 'new' method.
-
-For some of the common, more complex controller actions there are also snippets. For the create action, type 'defcreate' and fill out the template with 'post'.
-
-What I want the 'create' action to do is redirect back to the main blog controller for a page. Originally, I could use 'recai' for <code>redirect_to :controller => "blog", :action => "show", :id => @post</code> but its uncool to use anonymous paths.
-
-So instead let's just enter a named route that sounds nice, replace <code>@post</code> with  <code>blog_post_path(@post)</code>.
-
-[Change to the 'routes.rb' file.] So finally let's setup our routes. I'm going to delete all the default comments and default routes, and reconstruct it with named routes.
-
-h3. Diagram: Routes: map - named routes; maprs - map.resources; mapr - map.resource; mapwo - map.with_options
-
-Within a routes file, you have the three 'map' snippets. As you'll see in moment, the resources snippets include a block for nested resources.
-
-So we'll use 'map' to create named routes. Leave the name as 'connect' for anonymous routes. It is handy to know a Ruby snippet here: tabbing on colon (:) creates a hash key/value pair.
-
-<pre>map.public_page 'blog/show/:id', :controller => "blog", :action => "show"</pre>
-
-We could place this route within a with_options block, using 'mapwo'. Then add <code>map.root</code> within it.
-
-For our posts controller, we'll use the resources snippets. We use 'maprs' and change 'resource' to 'posts' and then we can tab into the block. Say we wanted comments to be a nested resource of posts, then we'd use 'maprs' again, and change 'map' to 'post' and remove the block. [then delete the comment resource + post's block].
-
-There is also a shortcut for the respond_to block - 'rest', which gives a default html response. To add additional response formats, tab on 'wants'. [remove these examples from new method]
-
-Now let's have a final look at functional tests for our create actions, which will require a POST request. [try to change to functional test] We don't have a posts_controller_test.rb, so it creates a blank file for us.
-
-To create a functional test class, use 'cla' again and select 'Create functional test class', and type 'Posts' for the class name prefix. Save the file, close the window and reopen within the project, otherwise some commands might not work if the file is initially not saved.
-
-Remember that test methods are created with 'deft', and the GET + POST methods are created with deftg and deftp. Let's test our create action with 'deftp'.
-
-Enter 'post', but remove the two optional sections as we're creating a new object, not updating an existing object. Within the <code>:post => {  }</code>, type : and tab to create the hash key values.
-
-Fetch the resulting object with <code>asg</code> + 'post'.
-
-Add a redirection assertion with <code>artp</code>.
-
-<pre syntax="ruby">def test_should_post_create
-  post :create, :post => { :title => "hi there", :body => "oh yeah" }
-  assert_response :redirect
-  assert(post = assigns(:post), "Cannot find @post")
-
-  assert_redirected_to blog_post_path(post)
-end</pre>
-
-If you just want to run the tests in the current file, or in fact run any Ruby file, use Cmd+R. As we can see, this test passes.
-
-h2. Views
-
-[back to posts_controller.rb]
-
-In the posts controller, we have a new action but we haven't created a template yet. As before, we can use the Navigation cmd to change from the controller to a view. In this case, the view is based on the current method. So we place the cursor in the new method, and it will ask us to create a new.html.erb file. Here is your opportunity to rename the template with alternate format or template extensions, say .xml.builder. But we'll use .html.erb for now.
-
-h3. Diagram: form_for - ff, form_for with error output - ffe
-
-We'll use 'ffe' and enter 'post'. In Rails 2.0, the form_for helper is very powerful and knows from the object it is passed whether it is creating or updating an object.
-
-h3. Diagram: f. - list of available helpers; or use first initial of helpers' names (fftf - text_field)
-
-Inside the form_for block we have two ways to access the common helpers.
-
-By using 'f.' it reminds us what helpers are available and tells us what their tab completions are.
-
-So, let's use the tab completion versions. ffl for label, fftf for text field.
-
-<pre><%= error_messages_for :post %>
-
-<% form_for @post do |f| -%>
-  <%= f.label :title, "Title" %>
-  <%= f.text_field :title %>
-  <%= f.label :body, "Body" %>
-  <%= f.text_area :body, :rows => 10 %>
-  <%= f.submit "Post", :disable_with => 'Posting...' %>
-<% end -%></pre>
-
-Now let's put each label or form field in a separate paragraph. Select those lines and use 'Wrap Each Selected Line in Open/Close' - Shift+Ctrl+Cmd+W, and type 'p'.
-
-h3. Diagram: Partials - Shift-Ctrl-H
-
-Since the form_for helper works with saved and unsaved model objects its easily reusable within new and edit templates. So let's extract it as a partial. [do it] And now the render can be pasted into an edit.html.erb file as required.
-
-[go to browser http://localhost:3000/posts/new]
-Now we can fire up the server and have a look at our form and use it. [submit form]
-
-As requested, the browser is redirected to the public post page; which we haven't implemented yet. So let's do that.
-
-We head back to the blog_controller, and create the show.html.erb via navigating away from the show action.
-
-Create a div and set its class to post, then layout the title and body:
-
-<div class="post">
-  <h3><%= @post.title %></h3>
-  <%= @post.body %>
-</div>
-
-If we run our tests, the 'show' action test is now passing.
-
-[Shft+Ctrl+H] So we can reuse it in the index.html.erb file, let's move it to a partial called 'post' and remove the '@' signs to reference a local variable instead of an instance variable.
-
-The returned 'render' expression isn't quite right as we need to pass the @post object into the partial. Let's remove it and use the 'render partial' snippets.
-
-h3. Diagram: render :partial - rp; render :partial, :object - rpo; render :partial, :collection - rpc; render :partial, :locals - rpl
-
-Create <%= %> and inside use 'rpo' and set the :object => @post.
-
-Now we create index.html.erb and use <%=  %> with 'rpc' and 'post'. The tests require that its wrapped in a div with id="posts". So select all, and Shift+Ctrl+W + div id="posts".
-
-h3. Diagram: Link helpers; lip - link_to "label", model_path(@model), etc.
-
-* lip   - <code><%= link_to "link text...", model_path(@model) %></code>
-* lipp  - <code><%= link_to "link text...", models_path %></code>
-* linp  - <code><%= link_to "link text...", parent_child_path(@parent, @child) %></code>
-* linpp - <code><%= link_to "link text...", parent_child_path(@parent) %></code>
-* lim   - <code><%= link_to model.name, model %></code>
-
-h2. Alternate templates
-
-h3. Diagram: html.erb, js.erb, js.rjs, xml.builder, xml.erb, html.builder
-
-In addition to html.erb templates, Rails supports any combination of output format and template engine. As appropriate you can combine html or javascript or xml with erb or rjs or builder, or any other 3rd party templating system such as haml.
-
-The Rails TextMate bundle provides varying support for different combinations.
-
-h3. Diagram: wants.js -> .js.rjs; wants.xml -> .xml.builder; wants.different -> .different.erb
-
-Navigation (e.g. tasty tidbit)
-
-Go to posts_controller, add wants.js to create action. Navigate and create posts/create.js.rjs.
-
-h3. Diagram: RJS snippets - hide, insert_html (ins), replace (rep), replace_html (reph), show, toggle (tog), visual_effect (vis)
-
-All these snippets include the page prefix and are nice ways to start each RJS expression.
-
-[remove all lines; rename with .erb] Another way to generate JavaScript within Rails is with the .js.erb extension. Instead of RJS expressions, you write pure JavaScript, but you can embed ruby using erb.
-
-A new syntax supported in the bundle is JavaScript (Rails), which maps to .js.erb files. That is, JavaScript files that permit embedded Ruby. This means, within the <%= %> tags you have access to your Ruby snippets and syntax highlighting.
-
-h2. Extending
\ No newline at end of file
diff --git a/bundles/ruby-on-rails.tmbundle/website/stylesheets/screen.css b/bundles/ruby-on-rails.tmbundle/website/stylesheets/screen.css
deleted file mode 100644
index 70f1cde3f..000000000
--- a/bundles/ruby-on-rails.tmbundle/website/stylesheets/screen.css
+++ /dev/null
@@ -1,177 +0,0 @@
-body {
-	background-color: #fff;
-	font-family: "Georgia", sans-serif;
-	font-size: 16px;
-	line-height: 1.6em;
-	padding: 1.6em 0 0 0;
-	color: #333;
-}
-
-h1, h2, h3, h4, h5, h6 {
-	color: #444;
-}
-
-h1 {
-	font-family: sans-serif;
-	font-weight: normal;
-	font-size: 4em;
-	line-height: 0.8em;
-	letter-spacing: -0.1ex;
-	margin: 5px;
-}
-
-li {
-	padding: 0;
-	margin: 0;
-	list-style-type: square;
-}
-
-a {
-	color: #5E5AFF;
-	font-weight: normal;
-	text-decoration: underline;
-}
-
-blockquote {
-	font-size: 90%;
-	font-style: italic;
-	border-left: 1px solid #111;
-	padding-left: 1em;
-}
-
-.caps {
-	font-size: 80%;
-}
-
-#main {
-	width: 45em;
-	padding: 0;
-	margin: 0 auto;
-}
-
-.coda {
-	text-align: right;
-	color: #77f;
-	font-size: smaller;
-}
-
-table {
-	font-size: 90%;
-	line-height: 1.4em;
-	color: #ff8;
-	background-color: #111;
-	padding: 2px 10px 2px 10px;
-	border-style: dashed;
-}
-
-th {
-	color: #fff;
-}
-
-td {
-	padding: 2px 10px 2px 10px;
-}
-
-.success {
-	color: #0CC52B;
-}
-
-.failed {
-	color: #E90A1B;
-}
-
-.unknown {
-	color: #995000;
-}
-
-pre, code {
-	font-family: monospace;
-	font-size: 90%;
-	line-height: 1.4em;
-	color: #ff8;
-	background-color: #111;
-	padding: 2px 10px 2px 10px;
-}
-
-.comment {
-	color: #aaa;
-	font-style: italic;
-}
-
-.keyword {
-	color: #eff;
-	font-weight: bold;
-}
-
-.punct {
-	color: #eee;
-	font-weight: bold;
-}
-
-.symbol {
-	color: #0bb;
-}
-
-.string {
-	color: #6b4;
-}
-
-.ident {
-	color: #ff8;
-}
-
-.constant {
-	color: #66f;
-}
-
-.regex {
-	color: #ec6;
-}
-
-.number {
-	color: #F99;
-}
-
-.expr {
-	color: #227;
-}
-
-#version {
-	float: right;
-	text-align: right;
-	font-family: sans-serif;
-	font-weight: normal;
-	background-color: #9A5535;
-	color: #141331;
-	padding: 15px 20px 10px 20px;
-	margin: 0 auto;
-	margin-top: 15px;
-	border: 3px solid #7E393E;
-}
-
-#version .numbers {
-	display: block;
-	font-size: 4em;
-	line-height: 0.8em;
-	letter-spacing: -0.1ex;
-	margin-bottom: 5px;
-}
-
-#version p {
-	text-decoration: none;
-	color: #F1F4FF;
-	background-color: #9A5535;
-	margin: 0;
-	padding: 0;
-}
-
-#version a {
-	text-decoration: none;
-	color: #F1F4FF;
-	background-color: #9A5535;
-}
-
-.clickable {
-	cursor: pointer;
-	cursor: hand;
-}
\ No newline at end of file
diff --git a/bundles/ruby-on-rails.tmbundle/website/template.html.erb b/bundles/ruby-on-rails.tmbundle/website/template.html.erb
deleted file mode 100644
index 5efa86a24..000000000
--- a/bundles/ruby-on-rails.tmbundle/website/template.html.erb
+++ /dev/null
@@ -1,60 +0,0 @@
-<!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>
-  <link rel="stylesheet" href="stylesheets/screen.css" type="text/css" media="screen" />
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-  <title>
-      <%= title %>
-  </title>
-  <script src="javascripts/rounded_corners_lite.inc.js" type="text/javascript"></script>
-
-  <script type="text/javascript">
-    window.onload = function() {
-      settings = {
-          tl: { radius: 10 },
-          tr: { radius: 10 },
-          bl: { radius: 10 },
-          br: { radius: 10 },
-          antiAlias: true,
-          autoPad: true,
-          validTags: ["div"]
-      }
-      var versionBox = new curvyCorners(settings, document.getElementById("version"));
-      versionBox.applyCornersToAll();
-    }
-  </script>
-</head>
-<body>
-<div id="main">
-	
-    <h1><%= title %></h1>
-    <div id="version" class="clickable" onclick='document.location = "<%= download %>"; return false'>
-      <p>Get Version</p>
-      <a href="<%= download %>" class="numbers"><%= version %></a>
-      <a href="<%= download %>" class="numbers"><img src="images/logo_bundle.png" width="50" height="51" alt="Logo Bundle" border=0></a>
-    </div>
-    <%= body %>
-    <p class="coda">
-      <a href="http://drnicwilliams.com">Dr Nic Williams</a>, <%= modified.pretty %><br>
-      Theme extended from <a href="http://rb2js.rubyforge.org/">Paul Battley</a>
-    </p>    
-
-    <!--
-	  * Matt A: "I'm new to this country, but I must be breaking some laws with this"
-	  * Allan O: "This is getting out of hand; I may have to cease development of TextMate"
-	  * Steve J: "This puts a ding in the universe"
-	//-->
-</div>
-
-<script type="text/javascript">
-var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
-document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
-</script>
-<script type="text/javascript">
-var pageTracker = _gat._getTracker("UA-567811-10");
-pageTracker._initData();
-pageTracker._trackPageview();
-</script>
-</body>
-</html>
diff --git a/bundles/ruby.tmbundle/Commands/Check ERB Syntax.plist b/bundles/ruby.tmbundle/Commands/Check ERB Syntax.plist
deleted file mode 100644
index 56a3ec340..000000000
--- a/bundles/ruby.tmbundle/Commands/Check ERB Syntax.plist	
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>command</key>
-	<string>#!/usr/bin/env ruby
-require ENV['TM_SUPPORT_PATH'] + '/lib/textmate'
-puts "using ruby-" + RUBY_VERSION.to_s + ' / erb'
-result = `"${TM_ERB:=erb}" -T - -x | "${TM_RUBY:=ruby}" -c 2&gt;&amp;1`
-puts result
-TextMate.go_to :line =&gt; $1 if result =~ /-:(\d+):/</string>
-	<key>input</key>
-	<string>document</string>
-	<key>keyEquivalent</key>
-	<string>^V</string>
-	<key>name</key>
-	<string>Validate Syntax (ERB)</string>
-	<key>output</key>
-	<string>showAsTooltip</string>
-	<key>scope</key>
-	<string>text.html.ruby, text.html source.ruby</string>
-	<key>uuid</key>
-	<string>76FCF165-54CB-4213-BC55-BD60B9C6A3EC</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Commands/Check Ruby Syntax.plist b/bundles/ruby.tmbundle/Commands/Check Ruby Syntax.plist
deleted file mode 100644
index b95036fc2..000000000
--- a/bundles/ruby.tmbundle/Commands/Check Ruby Syntax.plist	
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>command</key>
-	<string>#!/usr/bin/env ruby
-require ENV['TM_SUPPORT_PATH'] + '/lib/textmate'
-puts `"${TM_RUBY:=ruby}" -e'puts "Using ruby-" + RUBY_VERSION.to_s'`
-result = `"${TM_RUBY:=ruby}" -wc 2&gt;&amp;1`
-puts result
-TextMate.go_to :line =&gt; $1 if result =~ /-:(\d+):/
-</string>
-	<key>input</key>
-	<string>document</string>
-	<key>keyEquivalent</key>
-	<string>^V</string>
-	<key>name</key>
-	<string>Validate Syntax</string>
-	<key>output</key>
-	<string>showAsTooltip</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>uuid</key>
-	<string>EE5F19BA-6C02-11D9-92BA-0011242E4184</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Commands/Completion: Ruby (rcodetools).tmCommand b/bundles/ruby.tmbundle/Commands/Completion: Ruby (rcodetools).tmCommand
deleted file mode 100644
index 5cbf35c9c..000000000
--- a/bundles/ruby.tmbundle/Commands/Completion: Ruby (rcodetools).tmCommand	
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>command</key>
-	<string>#!/usr/bin/env ruby
-
-require "#{ENV["TM_SUPPORT_PATH"]}/lib/exit_codes"
-require "#{ENV["TM_SUPPORT_PATH"]}/lib/ui"
-
-require "pathname"
-
-TM_RUBY    = ENV["TM_RUBY"] || "ruby"
-RCODETOOLS = "#{ENV['TM_BUNDLE_SUPPORT']}/vendor/rcodetools"
-
-RAILS_DIR = nil
-dir = File.dirname(ENV["TM_FILEPATH"]) rescue ENV["TM_PROJECT_DIRECTORY"]
-if dir
-  dir = Pathname.new(dir)
-  loop do
-    if (dir + "config/environment.rb").exist?
-      Object.send(:remove_const, :RAILS_DIR)
-      RAILS_DIR = dir.to_s
-      break
-    end
-    
-    break if dir.to_s == "/"
-    
-    dir += ".."
-  end
-end
-
-command     = &lt;&lt;END_COMMAND.tr("\n", " ").strip
-"#{TM_RUBY}"
--I "#{RCODETOOLS}/lib"
---
-"#{RCODETOOLS}/bin/rct-complete"
-#{"-r \"#{RAILS_DIR}/config/environment.rb\"" if RAILS_DIR}
---line=#{ENV['TM_LINE_NUMBER']}
---column=#{ENV['TM_LINE_INDEX']}
-2&gt; /dev/null
-END_COMMAND
-completions = `#{command}`.split("\n").map { |l| l.strip }.select { |l| l =~ /\S/ }
-
-if not $?.success?
-  TextMate.exit_show_tool_tip "Parse error."
-elsif completions.size == 1
-  selected = completions.first
-elsif completions.size &gt; 1
-  selected = completions[TextMate::UI.menu(completions)] rescue exit
-else
-  TextMate.exit_show_tool_tip "No matches were found."
-end
-
-print selected.sub(/\A#{Regexp.escape(ENV['TM_CURRENT_WORD'].to_s)}/, "")
-</string>
-	<key>input</key>
-	<string>document</string>
-	<key>keyEquivalent</key>
-	<string>~</string>
-	<key>name</key>
-	<string>Completion: Ruby (rcodetools)</string>
-	<key>output</key>
-	<string>afterSelectedText</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>uuid</key>
-	<string>47D203ED-EB9B-4653-A07B-A897800CEB76</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Commands/Convert Ruby hash to 1_9 syntax.tmCommand b/bundles/ruby.tmbundle/Commands/Convert Ruby hash to 1_9 syntax.tmCommand
deleted file mode 100644
index 8f15d2b9d..000000000
--- a/bundles/ruby.tmbundle/Commands/Convert Ruby hash to 1_9 syntax.tmCommand	
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>command</key>
-	<string>#!/usr/bin/env ruby
-
-print case str = STDIN.read
-  when /=&gt;/;                 str.gsub(/:(\w+)[\s]+=&gt;[\s]+/, '\1: ')
-  when /(\w+):/;             str.gsub(/(\w+):(\s*(?:"(?:\\"|[^"])*"|'(?:\\'|[^'])*'|\w+\([^)]*\)|[^,]+))/, ":\\1 =&gt;\\2")
-  else;                      str
-end
-</string>
-	<key>fallbackInput</key>
-	<string>line</string>
-	<key>input</key>
-	<string>selection</string>
-	<key>keyEquivalent</key>
-	<string>^=</string>
-	<key>name</key>
-	<string>Toggle Ruby Hash 1.8/1.9 Syntax</string>
-	<key>output</key>
-	<string>replaceSelectedText</string>
-	<key>uuid</key>
-	<string>F4EEB2B6-07D8-402F-8FC3-79B7308D2576</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Commands/Enclose in * (RDoc comments).tmCommand b/bundles/ruby.tmbundle/Commands/Enclose in * (RDoc comments).tmCommand
deleted file mode 100644
index 6918b3a31..000000000
--- a/bundles/ruby.tmbundle/Commands/Enclose in * (RDoc comments).tmCommand	
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>command</key>
-	<string>#!/usr/bin/env ruby
-s = STDIN.read
-case s
-when /^\w+$/
-  print "*#{s}*$0"
-when ""
-  print "*$1*$0"
-else
-  print "&lt;b&gt;#{s}&lt;/b&gt;"
-end</string>
-	<key>fallbackInput</key>
-	<string>word</string>
-	<key>input</key>
-	<string>selection</string>
-	<key>keyEquivalent</key>
-	<string>@b</string>
-	<key>name</key>
-	<string>Bold</string>
-	<key>output</key>
-	<string>insertAsSnippet</string>
-	<key>scope</key>
-	<string>source.ruby comment</string>
-	<key>uuid</key>
-	<string>931DD73E-615E-476E-9B0D-8341023AE730</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Commands/Enclose in + (RDoc comments).tmCommand b/bundles/ruby.tmbundle/Commands/Enclose in + (RDoc comments).tmCommand
deleted file mode 100644
index 3a7820e5a..000000000
--- a/bundles/ruby.tmbundle/Commands/Enclose in + (RDoc comments).tmCommand	
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>command</key>
-	<string>#!/usr/bin/env ruby
-s = STDIN.read
-case s
-when /^\w+$/
-  print "+#{s}+$0"
-when ""
-  print "+$1+$0"
-else
-  print "&lt;tt&gt;#{s}&lt;/tt&gt;"
-end</string>
-	<key>fallbackInput</key>
-	<string>word</string>
-	<key>input</key>
-	<string>selection</string>
-	<key>keyEquivalent</key>
-	<string>@k</string>
-	<key>name</key>
-	<string>Typewriter</string>
-	<key>output</key>
-	<string>insertAsSnippet</string>
-	<key>scope</key>
-	<string>source.ruby comment</string>
-	<key>uuid</key>
-	<string>2DDB6FE0-6111-4C40-A149-8E67E76F8272</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Commands/Enclose in _ (RDoc comments).tmCommand b/bundles/ruby.tmbundle/Commands/Enclose in _ (RDoc comments).tmCommand
deleted file mode 100644
index 5516b637d..000000000
--- a/bundles/ruby.tmbundle/Commands/Enclose in _ (RDoc comments).tmCommand	
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>command</key>
-	<string>#!/usr/bin/env ruby
-s = STDIN.read
-case s
-when /^\w+$/
-  print "_#{s}_$0"
-when ""
-  print "_$1_$0"
-else
-  print "&lt;em&gt;#{s}&lt;/em&gt;"
-end</string>
-	<key>fallbackInput</key>
-	<string>word</string>
-	<key>input</key>
-	<string>selection</string>
-	<key>keyEquivalent</key>
-	<string>@i</string>
-	<key>name</key>
-	<string>Italic</string>
-	<key>output</key>
-	<string>insertAsSnippet</string>
-	<key>scope</key>
-	<string>source.ruby comment</string>
-	<key>uuid</key>
-	<string>DAA69A0C-FC1E-4509-9931-DFFB38B4D6AE</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Commands/Execute Line with Ruby.plist b/bundles/ruby.tmbundle/Commands/Execute Line with Ruby.plist
deleted file mode 100644
index 87934745f..000000000
--- a/bundles/ruby.tmbundle/Commands/Execute Line with Ruby.plist	
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>command</key>
-	<string>#!/usr/bin/env ruby
-
-# be smart, dont print something if we already have..
-$write_count = 0
-def STDOUT.write(what)
-   $write_count += 1
-   super(what)
-end
-
-# execure the code
-begin
-  # insert a space if input was a selection, if it was a line insert \n
-  print(ENV['TM_SELECTED_TEXT'] ? " " : "\n")
-  r = eval(STDIN.read)
-rescue Object
-  r = $!.class.to_s
-end
-
-# try to_s, if it doesnt work use inspect
-# Array and Hash are shown via inspect because they look better with formating
-# do this just if the script did not print anything itself
-if $write_count == 1
-  print( (r.class != Hash and r.class != Array and not r.nil? and r.respond_to? :to_s) ? r.to_s : r.inspect )
-  print( "\n" ) unless ENV.has_key?('TM_SELECTED_TEXT')
-end
-</string>
-	<key>fallbackInput</key>
-	<string>line</string>
-	<key>input</key>
-	<string>selection</string>
-	<key>keyEquivalent</key>
-	<string>^E</string>
-	<key>name</key>
-	<string>Execute Line / Selection as Ruby</string>
-	<key>output</key>
-	<string>afterSelectedText</string>
-	<key>uuid</key>
-	<string>EE5F1FB2-6C02-11D9-92BA-0011242E4184</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Commands/Execute and Insert Results.tmCommand b/bundles/ruby.tmbundle/Commands/Execute and Insert Results.tmCommand
deleted file mode 100644
index cab8b0d7c..000000000
--- a/bundles/ruby.tmbundle/Commands/Execute and Insert Results.tmCommand	
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>command</key>
-	<string>export RUBYLIB="$TM_BUNDLE_SUPPORT/vendor/rcodetools/lib${RUBYLIB:+:$RUBYLIB}"
-export TM_RUBY=$(which "${TM_RUBY:-ruby}")
-
-
-"${TM_RUBY}" -r "${TM_SUPPORT_PATH}/lib/ruby1.9/add_1.8_features.rb" -- "$TM_BUNDLE_SUPPORT/vendor/rcodetools/bin/xmpfilter"
-</string>
-	<key>fallbackInput</key>
-	<string>document</string>
-	<key>input</key>
-	<string>selection</string>
-	<key>keyEquivalent</key>
-	<string>^@E</string>
-	<key>name</key>
-	<string>Execute and Update ‘# =&gt;’ Markers</string>
-	<key>output</key>
-	<string>replaceSelectedText</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>uuid</key>
-	<string>FBFC214F-B019-4967-95D2-028F374A3221</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Commands/Insert Missing Requires.plist b/bundles/ruby.tmbundle/Commands/Insert Missing Requires.plist
deleted file mode 100644
index 0da76b106..000000000
--- a/bundles/ruby.tmbundle/Commands/Insert Missing Requires.plist	
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>command</key>
-	<string>#!/usr/bin/env ruby
-$: &lt;&lt; "#{ENV['TM_SUPPORT_PATH']}/lib"
-
-require "escape"
-require "open3"
-
-# make exceptions in the writing Thread kill the process so we don't hang
-Thread.abort_on_exception = true
-
-CURSOR = [0xFFFC].pack("U").freeze
-line, col = ENV["TM_LINE_NUMBER"].to_i - 1, ENV["TM_LINE_INDEX"].to_i
-
-stdin, stdout, stderr = Open3.popen3("/usr/bin/env", "ruby", "#{ENV['TM_BUNDLE_SUPPORT']}/bin/insert_requires.rb")
-Thread.new do
-  code = STDIN.read.to_a
-  unless ENV.has_key?('TM_SELECTED_TEXT')
-    if code[line].nil?  # if cursor was on the last line and it was blank
-      code &lt;&lt; CURSOR
-    else
-      code[line][col...col] = CURSOR
-    end
-  end
-  stdin.write code.join
-  stdin.close
-end
-
-print stdout.read.split(CURSOR).join('${0}')
-</string>
-	<key>fallbackInput</key>
-	<string>document</string>
-	<key>input</key>
-	<string>selection</string>
-	<key>keyEquivalent</key>
-	<string>^#</string>
-	<key>name</key>
-	<string>Insert Missing Requires</string>
-	<key>output</key>
-	<string>insertAsSnippet</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>uuid</key>
-	<string>9FB64639-F776-499B-BA6F-BB45F86F80FD</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Commands/Lookup in Documentation.plist b/bundles/ruby.tmbundle/Commands/Lookup in Documentation.plist
deleted file mode 100644
index fef94aaf5..000000000
--- a/bundles/ruby.tmbundle/Commands/Lookup in Documentation.plist	
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>command</key>
-	<string>"${TM_BUNDLE_SUPPORT}/bin/linked_ri.rb"</string>
-	<key>fallbackInput</key>
-	<string>word</string>
-	<key>input</key>
-	<string>selection</string>
-	<key>keyEquivalent</key>
-	<string>^h</string>
-	<key>name</key>
-	<string>Documentation for Word / Selection</string>
-	<key>output</key>
-	<string>showAsTooltip</string>
-	<key>scope</key>
-	<string>source.ruby, source.ruby.rails</string>
-	<key>uuid</key>
-	<string>63F3B3B7-CBE2-426B-B551-657733F3868B</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Commands/Make Destructive Call.plist b/bundles/ruby.tmbundle/Commands/Make Destructive Call.plist
deleted file mode 100644
index 39eb6d1b6..000000000
--- a/bundles/ruby.tmbundle/Commands/Make Destructive Call.plist	
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>command</key>
-	<string>res=$(ruby "$TM_BUNDLE_SUPPORT/bin/make_destructive.rb")
-
-if [ "$res" = "" ]
-  then exit_show_tool_tip "Retry this command without a selection."
-  else echo -n "$res"
-fi</string>
-	<key>fallbackInput</key>
-	<string>line</string>
-	<key>input</key>
-	<string>selection</string>
-	<key>keyEquivalent</key>
-	<string>^!</string>
-	<key>name</key>
-	<string>Add ! to Method in Line / Selection</string>
-	<key>output</key>
-	<string>insertAsSnippet</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>uuid</key>
-	<string>7F79BC8D-8A4F-4570-973B-05DFEC25747F</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Commands/New Method.plist b/bundles/ruby.tmbundle/Commands/New Method.plist
deleted file mode 100644
index 3cfd6dd1c..000000000
--- a/bundles/ruby.tmbundle/Commands/New Method.plist	
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>command</key>
-	<string>#!/usr/bin/env ruby -wKU
-
-require "#{ENV['TM_SUPPORT_PATH']}/lib/exit_codes"
-require "#{ENV['TM_SUPPORT_PATH']}/lib/escape"
-
-method_name = ENV["TM_SELECTED_TEXT"] || ENV["TM_CURRENT_WORD"] or
-  TextMate.exit_show_tool_tip(
-    "Please type the new function's name or use the def⇥ snippet."
-  )
-
-print &lt;&lt;END_SNIPPET
-def #{e_sn method_name}\${1/.+/(/}\${1:args}\${1/.+/)/}
-	\$0
-end
-END_SNIPPET
-</string>
-	<key>fallbackInput</key>
-	<string>word</string>
-	<key>input</key>
-	<string>selection</string>
-	<key>keyEquivalent</key>
-	<string>$
</string>
-	<key>name</key>
-	<string>New Method</string>
-	<key>output</key>
-	<string>insertAsSnippet</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>uuid</key>
-	<string>0275EF39-9357-408F-AF20-79E415CA9504</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Commands/Omit from RDoc.tmCommand b/bundles/ruby.tmbundle/Commands/Omit from RDoc.tmCommand
deleted file mode 100644
index b9cc7aeb9..000000000
--- a/bundles/ruby.tmbundle/Commands/Omit from RDoc.tmCommand	
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>command</key>
-	<string>#!/usr/bin/env ruby
-s = STDIN.read
-puts "\#--"
-if s== ""
-  puts "\# $0","\#++"
-else
-  puts s, "\#++", "$0"
-end</string>
-	<key>fallbackInput</key>
-	<string>line</string>
-	<key>input</key>
-	<string>selection</string>
-	<key>keyEquivalent</key>
-	<string>^@O</string>
-	<key>name</key>
-	<string>Omit</string>
-	<key>output</key>
-	<string>insertAsSnippet</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>uuid</key>
-	<string>BF4CA9F1-51CD-48D4-8357-852234F59046</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Commands/Open Require.tmCommand b/bundles/ruby.tmbundle/Commands/Open Require.tmCommand
deleted file mode 100644
index aa4a63358..000000000
--- a/bundles/ruby.tmbundle/Commands/Open Require.tmCommand	
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>command</key>
-	<string>#!/usr/bin/env ruby
-
-require "#{ENV['TM_SUPPORT_PATH']}/lib/ui.rb"
-require "#{ENV['TM_SUPPORT_PATH']}/lib/textmate.rb"
-
-REQUIRE_RE = /^\s*(?:require|load)\s*(['"])([^'"#]+?)(?:\.rb)?\1[ \t]*$/
-
-gems_installed = begin
-                   require 'rubygems'
-                   true
-                 rescue LoadError
-                   false
-                 end
-
-requires = if ENV['TM_CURRENT_LINE'].to_s =~ REQUIRE_RE
-             ["#{$2}.rb"]
-           else
-             $stdin.read.scan(REQUIRE_RE).map { |_, path| "#{path}.rb" }
-           end
-abort 'No includes found.' if requires.empty?
-
-file = if requires.size &gt; 1
-         choice = TextMate::UI.menu(requires) or exit
-         requires[choice]
-       else
-         requires.pop
-       end
-dir  = $LOAD_PATH.find { |dir| File.exist? File.join(dir, file) }
-if not dir and gems_installed and gem_spec = Gem::GemPathSearcher.new.find(file)
-  dir = File.join(gem_spec.full_gem_path, gem_spec.require_path)
-end
-
-if file and dir
-  dir.sub!(%r{\A\.(?=/|\z)}, ENV['TM_DIRECTORY']) if ENV['TM_DIRECTORY']
-  file_path = File.join(dir, file)
-# puts file_path
-  TextMate.go_to :file =&gt; file_path
-  exit
-else
-  puts "File not found: #{file}"
-end
-</string>
-	<key>fallbackInput</key>
-	<string>document</string>
-	<key>input</key>
-	<string>selection</string>
-	<key>keyEquivalent</key>
-	<string>@D</string>
-	<key>name</key>
-	<string>Open Require</string>
-	<key>output</key>
-	<string>showAsTooltip</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>uuid</key>
-	<string>8646378E-91F5-4771-AC7C-43FC49A93576</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Commands/Run Rake Task.tmCommand b/bundles/ruby.tmbundle/Commands/Run Rake Task.tmCommand
deleted file mode 100644
index 2d40b66f8..000000000
--- a/bundles/ruby.tmbundle/Commands/Run Rake Task.tmCommand	
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>command</key>
-	<string>export RUBYLIB="$TM_BUNDLE_SUPPORT/RakeMate${RUBYLIB:+:$RUBYLIB}"
-export TM_RUBY=$(which "${TM_RUBY:-ruby}")
-export TM_RAKE=$(which "${TM_RAKE:-rake}")
-
-"${TM_RUBY}" -- "$TM_BUNDLE_SUPPORT/RakeMate/rake_mate.rb"
-</string>
-	<key>input</key>
-	<string>none</string>
-	<key>keyEquivalent</key>
-	<string>^R</string>
-	<key>name</key>
-	<string>Run Rake Task</string>
-	<key>output</key>
-	<string>showAsHTML</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>uuid</key>
-	<string>569C9822-8C41-4907-94C7-1A8A0031B66D</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Commands/Run focused unit test.plist b/bundles/ruby.tmbundle/Commands/Run focused unit test.plist
deleted file mode 100644
index fe3e4ca14..000000000
--- a/bundles/ruby.tmbundle/Commands/Run focused unit test.plist	
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>captureFormatString</key>
-	<string>$0</string>
-	<key>capturePattern</key>
-	<string>(/[^:]+):(\d+)</string>
-	<key>command</key>
-	<string>#!/bin/sh
-
-export RUBYLIB="$TM_BUNDLE_SUPPORT/RubyMate${RUBYLIB:+:$RUBYLIB}"
-
-/usr/bin/env ruby -KU -- "$TM_BUNDLE_SUPPORT/RubyMate/run_script.rb" --name=
-</string>
-	<key>fileCaptureRegister</key>
-	<string>1</string>
-	<key>input</key>
-	<string>document</string>
-	<key>keyEquivalent</key>
-	<string>@R</string>
-	<key>lineCaptureRegister</key>
-	<string>2</string>
-	<key>name</key>
-	<string>Run Focused Unit Test</string>
-	<key>output</key>
-	<string>showAsHTML</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>uuid</key>
-	<string>5289EE40-86B8-11D9-A8D4-000A95E13C98</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Commands/Run.tmCommand b/bundles/ruby.tmbundle/Commands/Run.tmCommand
deleted file mode 100644
index b2baaac21..000000000
--- a/bundles/ruby.tmbundle/Commands/Run.tmCommand
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>autoScrollOutput</key>
-	<true/>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>command</key>
-	<string>#!/bin/sh
-
-export RUBYLIB="$TM_BUNDLE_SUPPORT/RubyMate${RUBYLIB:+:$RUBYLIB}"
-
-/usr/bin/env ruby -KU -- "$TM_BUNDLE_SUPPORT/RubyMate/run_script.rb"
-</string>
-	<key>input</key>
-	<string>document</string>
-	<key>keyEquivalent</key>
-	<string>@r</string>
-	<key>name</key>
-	<string>Run</string>
-	<key>output</key>
-	<string>showAsHTML</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>uuid</key>
-	<string>35222962-C50D-4D58-A6AE-71E7AD980BE4</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Commands/Show RDoc for this file.plist b/bundles/ruby.tmbundle/Commands/Show RDoc for this file.plist
deleted file mode 100644
index f9e0868d8..000000000
--- a/bundles/ruby.tmbundle/Commands/Show RDoc for this file.plist	
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>saveActiveFile</string>
-	<key>command</key>
-	<string>if (( ${#TM_PROJECT_DIRECTORY} != 0 )); then
-    cd "$TM_PROJECT_DIRECTORY"
-    output="`basename "$TM_PROJECT_DIRECTORY"`"
-    input="."
-else
-    cd "$TM_DIRECTORY"
-    output="$TM_FILENAME"
-    input="$TM_FILENAME"
-fi
-
-output_dir="/tmp/rdoc_${output}"
-
-rm -rf "${output_dir}"
-
-rdoc -S -N -q -f html --op "${output_dir}" "$input" &amp;&gt;/dev/null
-
-echo "&lt;html&gt;&lt;head&gt;&lt;meta http-equiv=\"refresh\" content=\"0;URL=tm-file://${output_dir}/index.html\"&gt;&lt;/head&gt;&lt;/html&gt;"
-</string>
-	<key>input</key>
-	<string>none</string>
-	<key>name</key>
-	<string>Show for Current File / Project</string>
-	<key>output</key>
-	<string>showAsHTML</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>uuid</key>
-	<string>1AD6A138-2E89-4D6A-AB3F-416BF9CE968D</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Commands/Toggle ERb Tags.tmCommand b/bundles/ruby.tmbundle/Commands/Toggle ERb Tags.tmCommand
deleted file mode 100644
index 36dfed029..000000000
--- a/bundles/ruby.tmbundle/Commands/Toggle ERb Tags.tmCommand	
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>command</key>
-	<string>#!/usr/bin/env ruby -w
-
-require "#{ENV["TM_SUPPORT_PATH"]}/lib/escape"
-require "enumerator"
-
-TAGS = %w[&lt;%= &lt;%# &lt;%- &lt;%].freeze
-
-# locate caret (Allan's code)
-line = ENV['TM_LINE_NUMBER'].to_i - ENV['TM_INPUT_START_LINE'].to_i
-col  = ENV['TM_LINE_INDEX'].to_i
-if ENV['TM_LINE_NUMBER'].to_i == ENV['TM_INPUT_START_LINE'].to_i
-  col -= ENV['TM_INPUT_START_LINE_INDEX'].to_i
-end
-
-# read input
-input = $stdin.read
-
-# snippetize output
-lines       = RUBY_VERSION &lt; "1.9" ? input.to_a : input.lines.to_a
-lines[line] = e_sn(lines[line][0...col]) + "${0}" + e_sn(lines[line][col..-1])
-enum        = RUBY_VERSION &lt; "1.9" ? lines.enum_with_index :
-                                     lines.each.with_index
-output      = enum.inject(String.new) do |out, (l, i)|
-  i == line ? out + l : out + e_sn(l)
-end
-
-# swap ERb tags
-result = output.sub(/\A&lt;%[-#=]?/) { |match| TAGS[TAGS.index(match) - 1] }
-if result[2] == ?-
-  result.sub!(/%&gt;\Z/, "-%&gt;")
-else
-  result.sub!(/-%&gt;\Z/, "%&gt;")
-end
-print result</string>
-	<key>disableOutputAutoIndent</key>
-	<true/>
-	<key>fallbackInput</key>
-	<string>scope</string>
-	<key>input</key>
-	<string>selection</string>
-	<key>keyEquivalent</key>
-	<string>^&gt;</string>
-	<key>name</key>
-	<string>Toggle ERb Tags</string>
-	<key>output</key>
-	<string>insertAsSnippet</string>
-	<key>scope</key>
-	<string>source.ruby.embedded, source.ruby.rails.embedded, comment.block.erb, meta.erb</string>
-	<key>uuid</key>
-	<string>835FAAC6-5431-436C-998B-241F7226B99B</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Commands/Toggle Quote Style.plist b/bundles/ruby.tmbundle/Commands/Toggle Quote Style.plist
deleted file mode 100644
index 16de1a596..000000000
--- a/bundles/ruby.tmbundle/Commands/Toggle Quote Style.plist	
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>command</key>
-	<string>#!/usr/bin/env ruby
-
-class String
-  def escape(char)
-    gsub(/\\.|#{Regexp.quote(char)}/) { |match| match == char ? "\\#{char}" : match }
-  end
-
-  def unescape(char)
-    gsub(/\\./) { |match| match == "\\#{char}" ? char : match }
-  end
-end
-
-print case str = STDIN.read
-  # Handle standard quotes
-  when /\A"(.*)"\z/m;          "'"   + $1.unescape('"').escape("'") + "'"
-  when /\A'(.*)'\z/m;          "%Q{" + $1.unescape("'").escape("}") + "}"
-  when /\A%[Qq]?\{(.*)\}\z/m;  '"'   + $1.unescape("}").escape('"') + '"'
-
-  # Handle the more esoteric quote styles
-  when /\A%[Qq]?\[(.*)(\])\z/m,
-       /\A%[Qq]?\((.*)(\))\z/m,
-       /\A%[Qq]?&lt;(.*)(&gt;)\z/m;  '"' + $1.unescape($2).escape('"') + '"'
-  when /\A%[Qq]?(.)(.*)\1\z/m; '"' + $2.unescape($1).escape('"') + '"'
-
-  # Handle shell escapes
-  when /\A`(.*)`\z/m;          "%x{" + $1.unescape("`").escape("}") + "}"
-  when /\A%x\{(.*)\}\z/m;      "`"   + $1.unescape("}").escape("`") + "`"
-
-  # Default case
-  else str
-end
-</string>
-	<key>fallbackInput</key>
-	<string>scope</string>
-	<key>input</key>
-	<string>selection</string>
-	<key>keyEquivalent</key>
-	<string>^"</string>
-	<key>name</key>
-	<string>Toggle Quote Style</string>
-	<key>output</key>
-	<string>replaceSelectedText</string>
-	<key>scope</key>
-	<string>source.ruby string.quoted.double, source.ruby string.quoted.single, source.ruby string</string>
-	<key>uuid</key>
-	<string>6519CB08-8326-4B77-A251-54722FFBFC1F</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Commands/Toggle String:Symbol.tmCommand b/bundles/ruby.tmbundle/Commands/Toggle String:Symbol.tmCommand
deleted file mode 100644
index e97971296..000000000
--- a/bundles/ruby.tmbundle/Commands/Toggle String:Symbol.tmCommand	
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>bundleUUID</key>
-	<string>467B298F-6227-11D9-BFB1-000D93589AF6</string>
-	<key>command</key>
-	<string>#!/usr/bin/env ruby
-
-print case str = STDIN.read
-  # Handle standard quotes
-  when /\A["'](\w+)["']\z/ then ":" + $1
-  when /\A:(\w+)\z/ then '"' + $1 + '"'
-  # Default case
-  else str
-end
-</string>
-	<key>fallbackInput</key>
-	<string>scope</string>
-	<key>input</key>
-	<string>selection</string>
-	<key>keyEquivalent</key>
-	<string>^:</string>
-	<key>name</key>
-	<string>Toggle String / Symbol</string>
-	<key>output</key>
-	<string>replaceSelectedText</string>
-	<key>scope</key>
-	<string>source.ruby string.quoted, source.ruby constant.other.symbol.ruby</string>
-	<key>uuid</key>
-	<string>B297E4B8-A8FF-49CE-B9C4-6D4911724D43</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Commands/Toggle ‘do … end’ : ‘{ … }’.tmCommand b/bundles/ruby.tmbundle/Commands/Toggle ‘do … end’ : ‘{ … }’.tmCommand
deleted file mode 100644
index 29ef44b62..000000000
--- a/bundles/ruby.tmbundle/Commands/Toggle ‘do … end’ : ‘{ … }’.tmCommand	
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>command</key>
-	<string>#!/usr/bin/env ruby -KU
-# encoding:  UTF-8
-
-require "rexml/text"
-require "#{ENV["TM_SUPPORT_PATH"]}/lib/escape"
-
-# transform XML into normal and sanitized Ruby
-ruby, safe_ruby, scope = "", "", []
-STDIN.read.scan(/&lt;(.*?)&gt;|([^&lt;]+)/) do
-  if $1
-    if $1[0] == ?/
-      scope.pop
-    else
-      scope.push($1)
-    end
-  else
-    unescaped =  REXML::Text.unnormalize($2)
-    ruby      &lt;&lt; unescaped
-    # strip strings, regexes, and comments from safe_ruby but leave byte count
-    if scope.any? { |s| s =~ /\A(?:string|comment)\b/ }
-      safe_ruby &lt;&lt; " " * unescaped.length
-    else
-      safe_ruby &lt;&lt; unescaped
-    end
-  end
-end
-
-# find and mark the cursor
-line_number      = ENV["TM_LINE_NUMBER"].to_i
-input_start_line = ENV["TM_INPUT_START_LINE"].to_i
-row              = line_number - input_start_line
-col              = ENV["TM_LINE_INDEX"].to_i
-if line_number == input_start_line
-  col -= ENV["TM_INPUT_START_LINE_INDEX"].to_i
-end
-cursor               = ruby[/\A(?:.*\n){#{row - 1}}.{#{col}}/].size
-CURSOR               = [0xFFFC].pack("U")
-B                    = "(?:\\b|#{CURSOR})"  # Note:  /\w/u includes CURSOR
-ruby[cursor, 0]      = CURSOR
-safe_ruby[cursor, 0] = CURSOR
-
-# find the block nearest to the cursor
-block_start, block_length = nil, nil
-loop do
-  block_start = safe_ruby.rindex( /(\{|#{B}do#{B})/,
-                                  block_start.nil? ? cursor : block_start - 1 )
-  if block_start.nil?  # block not found:  give up and don't change the document
-    print e_sn(ruby).sub(CURSOR, "$0")
-    exit
-  end
-  block_length, nesting = 0, []
-  if $1 == "{"
-    re, starts, stop = /\{|\}|[^{}]+/, ["{"], "}"
-  else
-    re, starts, stop = /#{B}do#{B}|#{B}end#{B}|./m, ["do"], "end"
-  end
-  safe_ruby[block_start..-1].scan(re) do |token|
-    block_length += token.length
-    token.sub!(/\A#{CURSOR}/, "")
-    token.sub!(/#{CURSOR}\z/, "")
-    case token
-    when *starts
-      nesting &lt;&lt; token
-    when stop
-      if nesting.last.nil?
-        nesting &lt;&lt; nil
-        break
-      else
-        nesting.pop
-        break if nesting.empty?
-      end
-    end
-  end
-  break if nesting.empty? and ruby[block_start, block_length].include? CURSOR
-end
-block = ruby[block_start, block_length]
-
-# toggle the block
-if block[0] == ?{
-  block = block[1..-2]
-  if block.include? "\n"
-    block[0, 0] =  " " if block =~ /\A#{CURSOR}?[A-Za-z0-9_]/
-    block       &lt;&lt; " " if block =~ /[A-Za-z0-9_]#{CURSOR}?\z/
-    block       =  "do#{block}end"
-  else  # expand the block
-    block.strip!
-    lines = %w[do]
-    if block.sub!(/\A(#{CURSOR}?(\s*)\|[^|]*\|)/, "")
-      lines.first &lt;&lt; "#{' ' if $2.empty?}#{$1}"
-    end
-    indent =  ruby[0...block_start][/^([ \t]*).*\Z/, 1]
-    tab    =  ( ENV["TM_SOFT_TABS"] == "YES" ? " " * ENV["TM_TAB_SIZE"].to_i :
-                                               "\t" )
-    lines  &lt;&lt; "#{indent}#{tab}#{block.strip}"
-    lines  &lt;&lt; "#{indent}end"
-    block  =  lines.join("\n")
-  end
-else
-  block = block[2..-4]
-  if block.include? "\n"  # collapse the block
-    lines = block.send(block.respond_to?(:lines) ? :lines : :to_s).to_a
-    lines.first.send(
-      "#{'r' if lines.first =~ /\A\s*#{CURSOR}?\s*\|[^|]*\|/}strip!"
-    )
-    lines[1..-1].each do |line|
-      line.strip!
-    end
-    lines.first &lt;&lt; "; " unless lines.first =~
-                               /\A\s*#{CURSOR}?\s*(?:\|[^|]*\|)?\s*#{CURSOR}?\z/
-    lines.first &lt;&lt; " "  unless lines.first =~ /\s\z/
-    lines[1..-2].each do |line|
-      line &lt;&lt; "; "
-    end
-    lines[-2].sub!(/; \z/, "") if lines.size &gt; 2 and lines.last.empty?
-    cursor_by_end = lines.size &gt; 2 &amp;&amp; lines.last == CURSOR
-    lines[-2].sub!(/; \z/, " ") if cursor_by_end
-    block = "{#{lines.join}#{' ' unless cursor_by_end}}"
-  else
-    block = "{#{block}}"
-  end
-end
-
-# replace document
-print e_sn(ruby[0...block_start])
-print e_sn(block).sub(CURSOR, "$0")
-print e_sn(ruby[(block_start + block_length)..-1])
-</string>
-	<key>input</key>
-	<string>selection</string>
-	<key>inputFormat</key>
-	<string>xml</string>
-	<key>keyEquivalent</key>
-	<string>^{</string>
-	<key>name</key>
-	<string>Toggle ‘do … end’ / ‘{ … }’</string>
-	<key>output</key>
-	<string>insertAsSnippet</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>uuid</key>
-	<string>59E811FF-E722-46BE-8938-04713612FABB</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Commands/word_wrap()  (worw).plist b/bundles/ruby.tmbundle/Commands/word_wrap()  (worw).plist
deleted file mode 100644
index 5cdad7504..000000000
--- a/bundles/ruby.tmbundle/Commands/word_wrap()  (worw).plist	
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>command</key>
-	<string>#!/usr/bin/env ruby
-$: &lt;&lt; ENV['TM_SUPPORT_PATH'] + '/lib'
-require "ui"
-TextMate::UI.request_string(:title =&gt; "Wrap Size",
-                     :prompt =&gt; "Enter a character width:",
-                    :button1 =&gt; "Build Snippet") do |col|
-  col = col.to_i
-  print %Q{gsub!(/(.{1,#{col}}|\\S{#{col + 1},})(?: +|$\\n?)/, "\\\\1\\n")}
-end
-</string>
-	<key>input</key>
-	<string>none</string>
-	<key>name</key>
-	<string>word_wrap()</string>
-	<key>output</key>
-	<string>afterSelectedText</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>worw</string>
-	<key>uuid</key>
-	<string>97054C4D-E4A3-45B1-9C00-B82DBCB30CAD</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/DragCommands/Require Ruby File.tmDragCommand b/bundles/ruby.tmbundle/DragCommands/Require Ruby File.tmDragCommand
deleted file mode 100644
index f8ea01ea6..000000000
--- a/bundles/ruby.tmbundle/DragCommands/Require Ruby File.tmDragCommand	
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>command</key>
-	<string>#!/usr/bin/env ruby -wKU
-
-require 'pathname'
-
-require "#{ENV['TM_SUPPORT_PATH']}/lib/escape.rb"
-
-from_path = Pathname.new(ENV['TM_FILEPATH'] || '.').dirname.realpath
-to_path   = Pathname.new(ENV['TM_DROPPED_FILE']).realpath
-begin
-  path    = to_path.relative_path_from(from_path)
-rescue ArgumentError
-  path    = to_path
-end
-lib       = path.to_s.sub(/\.rb\z/i, '')
-puts %Q{require "#{e_sn(lib).gsub('"', '\"')}"}
-</string>
-	<key>draggedFileExtensions</key>
-	<array>
-		<string>rb</string>
-	</array>
-	<key>input</key>
-	<string>selection</string>
-	<key>name</key>
-	<string>Require Ruby File</string>
-	<key>output</key>
-	<string>insertAsSnippet</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>uuid</key>
-	<string>C122CD92-DDBE-4869-9C7A-CC2B254C9411</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Macros/Benchmark_bmbm(__) do __ end.tmMacro b/bundles/ruby.tmbundle/Macros/Benchmark_bmbm(__) do __ end.tmMacro
deleted file mode 100644
index 96fa6c082..000000000
--- a/bundles/ruby.tmbundle/Macros/Benchmark_bmbm(__) do __ end.tmMacro	
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>commands</key>
-	<array>
-		<dict>
-			<key>command</key>
-			<string>moveToBeginningOfDocumentAndModifySelection:</string>
-		</dict>
-		<dict>
-			<key>argument</key>
-			<dict>
-				<key>command</key>
-				<string>insert_requires.rb benchmark</string>
-				<key>input</key>
-				<string>selection</string>
-				<key>output</key>
-				<string>insertAsSnippet</string>
-			</dict>
-			<key>command</key>
-			<string>executeCommandWithOptions:</string>
-		</dict>
-		<dict>
-			<key>argument</key>
-			<dict>
-				<key>content</key>
-				<string>TESTS = ${1:10_000}
-Benchmark.bmbm do |results|
-  $0
-end</string>
-				<key>name</key>
-				<string>Benchmark.bmbm do .. end</string>
-				<key>scope</key>
-				<string>source.ruby</string>
-				<key>tabTrigger</key>
-				<string>bm-</string>
-				<key>uuid</key>
-				<string>942F20E2-C40A-44B8-A3F2-99AAC68CB534</string>
-			</dict>
-			<key>command</key>
-			<string>insertSnippetWithOptions:</string>
-		</dict>
-	</array>
-	<key>name</key>
-	<string>Benchmark.bmbm do .. end</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>bm</string>
-	<key>uuid</key>
-	<string>C649F945-DAB8-4DA2-B73C-2EFF9D7D34F3</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Macros/Delete forward:backward.tmMacro b/bundles/ruby.tmbundle/Macros/Delete forward:backward.tmMacro
deleted file mode 100644
index 0c8a71322..000000000
--- a/bundles/ruby.tmbundle/Macros/Delete forward:backward.tmMacro	
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>commands</key>
-	<array>
-		<dict>
-			<key>command</key>
-			<string>deleteBackward:</string>
-		</dict>
-		<dict>
-			<key>command</key>
-			<string>deleteForward:</string>
-		</dict>
-	</array>
-	<key>keyEquivalent</key>
-	<string></string>
-	<key>name</key>
-	<string>Delete forward/backward</string>
-	<key>scope</key>
-	<string>source.ruby.embedded.source.empty</string>
-	<key>uuid</key>
-	<string>A83F68A9-F751-4BB4-AE16-56812878C16A</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Macros/Overwrite } in #{ .. }.plist b/bundles/ruby.tmbundle/Macros/Overwrite } in #{ .. }.plist
deleted file mode 100644
index 4845d9652..000000000
--- a/bundles/ruby.tmbundle/Macros/Overwrite } in #{ .. }.plist	
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>commands</key>
-	<array>
-		<dict>
-			<key>command</key>
-			<string>moveRightAndModifySelection:</string>
-		</dict>
-		<dict>
-			<key>argument</key>
-			<dict>
-				<key>action</key>
-				<string>replaceAll</string>
-				<key>findInProjectIgnoreCase</key>
-				<false/>
-				<key>findString</key>
-				<string>((?m:.){2,})|\}|([^}])</string>
-				<key>ignoreCase</key>
-				<false/>
-				<key>regularExpression</key>
-				<true/>
-				<key>replaceAllScope</key>
-				<string>selection</string>
-				<key>replaceString</key>
-				<string>$1}$2</string>
-				<key>wrapAround</key>
-				<false/>
-			</dict>
-			<key>command</key>
-			<string>findWithOptions:</string>
-		</dict>
-		<dict>
-			<key>command</key>
-			<string>moveLeft:</string>
-		</dict>
-		<dict>
-			<key>command</key>
-			<string>moveRight:</string>
-		</dict>
-	</array>
-	<key>keyEquivalent</key>
-	<string>}</string>
-	<key>name</key>
-	<string>Overwrite '}' in #{ .. }</string>
-	<key>scope</key>
-	<string>source.ruby string.quoted source.ruby.embedded</string>
-	<key>scopeType</key>
-	<string>local</string>
-	<key>uuid</key>
-	<string>E5158F94-CC52-4424-A495-14EF9272653F</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Macros/PStore_new( __ ).tmMacro b/bundles/ruby.tmbundle/Macros/PStore_new( __ ).tmMacro
deleted file mode 100644
index c7604d0b3..000000000
--- a/bundles/ruby.tmbundle/Macros/PStore_new( __ ).tmMacro	
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>commands</key>
-	<array>
-		<dict>
-			<key>command</key>
-			<string>moveToBeginningOfDocumentAndModifySelection:</string>
-		</dict>
-		<dict>
-			<key>argument</key>
-			<dict>
-				<key>command</key>
-				<string>insert_requires.rb pstore</string>
-				<key>input</key>
-				<string>selection</string>
-				<key>output</key>
-				<string>insertAsSnippet</string>
-			</dict>
-			<key>command</key>
-			<string>executeCommandWithOptions:</string>
-		</dict>
-		<dict>
-			<key>argument</key>
-			<dict>
-				<key>content</key>
-				<string>PStore.new(${1:"${2:file_name.pstore}"})</string>
-				<key>name</key>
-				<string>PStore.new( .. )</string>
-				<key>scope</key>
-				<string>source.ruby</string>
-				<key>tabTrigger</key>
-				<string>Pn-</string>
-				<key>uuid</key>
-				<string>5B46ECFD-23A4-4F0C-9951-F64C19C72C2B</string>
-			</dict>
-			<key>command</key>
-			<string>insertSnippetWithOptions:</string>
-		</dict>
-	</array>
-	<key>name</key>
-	<string>PStore.new( .. )</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>Pn</string>
-	<key>uuid</key>
-	<string>5AE7CFB4-418E-4E00-AD76-06DB755EE876</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Macros/YAML.dump(.., file)  (Yd).plist b/bundles/ruby.tmbundle/Macros/YAML.dump(.., file)  (Yd).plist
deleted file mode 100644
index 0025b572b..000000000
--- a/bundles/ruby.tmbundle/Macros/YAML.dump(.., file)  (Yd).plist	
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>commands</key>
-	<array>
-		<dict>
-			<key>command</key>
-			<string>moveToBeginningOfDocumentAndModifySelection:</string>
-		</dict>
-		<dict>
-			<key>argument</key>
-			<dict>
-				<key>command</key>
-				<string>insert_requires.rb yaml</string>
-				<key>input</key>
-				<string>selection</string>
-				<key>output</key>
-				<string>insertAsSnippet</string>
-			</dict>
-			<key>command</key>
-			<string>executeCommandWithOptions:</string>
-		</dict>
-		<dict>
-			<key>argument</key>
-			<dict>
-				<key>bundlePath</key>
-				<string>/Users/james/Library/Application Support/TextMate/Bundles/Ruby Idioms.tmbundle</string>
-				<key>content</key>
-				<string>File.open(${1:"${2:path/to/file}.yaml"}, "w") { |${3:file}| YAML.dump(${4:obj}, ${3:file}) }</string>
-				<key>scope</key>
-				<string>source.ruby</string>
-				<key>supportPath</key>
-				<string>/Users/james/Library/Application Support/TextMate/Bundles/Ruby Idioms.tmbundle/Support</string>
-				<key>tabTrigger</key>
-				<string>Yd-</string>
-				<key>uuid</key>
-				<string>3BA6762A-BB6B-489E-8006-F30F386AEF48</string>
-			</dict>
-			<key>command</key>
-			<string>insertSnippetWithOptions:</string>
-		</dict>
-	</array>
-	<key>keyEquivalent</key>
-	<string></string>
-	<key>name</key>
-	<string>YAML.dump(.., file)</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>scopeType</key>
-	<string>local</string>
-	<key>tabTrigger</key>
-	<string>Yd</string>
-	<key>uuid</key>
-	<string>9460392B-C036-4A76-A5AE-1191F10E4B1B</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Macros/YAML.load(file)  (Yl).plist b/bundles/ruby.tmbundle/Macros/YAML.load(file)  (Yl).plist
deleted file mode 100644
index 84b2534c8..000000000
--- a/bundles/ruby.tmbundle/Macros/YAML.load(file)  (Yl).plist	
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>commands</key>
-	<array>
-		<dict>
-			<key>command</key>
-			<string>moveToBeginningOfDocumentAndModifySelection:</string>
-		</dict>
-		<dict>
-			<key>argument</key>
-			<dict>
-				<key>command</key>
-				<string>insert_requires.rb yaml</string>
-				<key>input</key>
-				<string>selection</string>
-				<key>output</key>
-				<string>insertAsSnippet</string>
-			</dict>
-			<key>command</key>
-			<string>executeCommandWithOptions:</string>
-		</dict>
-		<dict>
-			<key>argument</key>
-			<dict>
-				<key>bundlePath</key>
-				<string>/Users/james/Library/Application Support/TextMate/Bundles/Ruby Idioms.tmbundle</string>
-				<key>content</key>
-				<string>File.open(${1:"${2:path/to/file}.yaml"}) { |${3:file}| YAML.load(${3:file}) }</string>
-				<key>scope</key>
-				<string>source.ruby</string>
-				<key>supportPath</key>
-				<string>/Users/james/Library/Application Support/TextMate/Bundles/Ruby Idioms.tmbundle/Support</string>
-				<key>tabTrigger</key>
-				<string>Yl-</string>
-				<key>uuid</key>
-				<string>8343ACF4-EEB7-44B5-B835-94826466D4D5</string>
-			</dict>
-			<key>command</key>
-			<string>insertSnippetWithOptions:</string>
-		</dict>
-	</array>
-	<key>keyEquivalent</key>
-	<string></string>
-	<key>name</key>
-	<string>YAML.load(file)</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>scopeType</key>
-	<string>local</string>
-	<key>tabTrigger</key>
-	<string>Yl</string>
-	<key>uuid</key>
-	<string>2C07D4E7-D74F-4AE4-82BE-B0BA82247AFA</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Macros/class .. < DelegateClass .. initialize .. end  (class).plist b/bundles/ruby.tmbundle/Macros/class .. < DelegateClass .. initialize .. end  (class).plist
deleted file mode 100644
index e0cbb0f47..000000000
--- a/bundles/ruby.tmbundle/Macros/class .. < DelegateClass .. initialize .. end  (class).plist	
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>commands</key>
-	<array>
-		<dict>
-			<key>command</key>
-			<string>moveToBeginningOfDocumentAndModifySelection:</string>
-		</dict>
-		<dict>
-			<key>argument</key>
-			<dict>
-				<key>command</key>
-				<string>insert_requires.rb delegate</string>
-				<key>input</key>
-				<string>selection</string>
-				<key>output</key>
-				<string>insertAsSnippet</string>
-			</dict>
-			<key>command</key>
-			<string>executeCommandWithOptions:</string>
-		</dict>
-		<dict>
-			<key>argument</key>
-			<dict>
-				<key>bundlePath</key>
-				<string>/Users/james/Library/Application Support/TextMate/Bundles/Ruby Idioms.tmbundle</string>
-				<key>content</key>
-				<string>class ${1:${TM_FILENAME/(?:\A|_)([A-Za-z0-9]+)(?:\.rb)?/(?2::\u$1)/g}} &lt; DelegateClass(${2:ParentClass})
-	def initialize${3/(^.*?\S.*)|.*/(?1:\()/}${3:args}${3/(^.*?\S.*)|.*/(?1:\))/}
-		super(${4:del_obj})
-		
-		$0
-	end
-	
-	
-end</string>
-				<key>scope</key>
-				<string>source.ruby</string>
-				<key>supportPath</key>
-				<string>/Users/james/Library/Application Support/TextMate/Bundles/Ruby Idioms.tmbundle/Support</string>
-				<key>tabTrigger</key>
-				<string>class-</string>
-				<key>uuid</key>
-				<string>AFE1D078-EA16-45F5-AD8A-FAC1B523D861</string>
-			</dict>
-			<key>command</key>
-			<string>insertSnippetWithOptions:</string>
-		</dict>
-	</array>
-	<key>name</key>
-	<string>class .. &lt; DelegateClass .. initialize .. end</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>scopeType</key>
-	<string>local</string>
-	<key>tabTrigger</key>
-	<string>cla</string>
-	<key>uuid</key>
-	<string>121B334B-2AA6-4E9A-A8B8-BF93B627982B</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Macros/each_char { |chr| .. }  (eac).plist b/bundles/ruby.tmbundle/Macros/each_char { |chr| .. }  (eac).plist
deleted file mode 100644
index de9c34445..000000000
--- a/bundles/ruby.tmbundle/Macros/each_char { |chr| .. }  (eac).plist	
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>commands</key>
-	<array>
-		<dict>
-			<key>command</key>
-			<string>moveToBeginningOfDocumentAndModifySelection:</string>
-		</dict>
-		<dict>
-			<key>argument</key>
-			<dict>
-				<key>command</key>
-				<string>insert_requires.rb jcode</string>
-				<key>input</key>
-				<string>selection</string>
-				<key>output</key>
-				<string>insertAsSnippet</string>
-			</dict>
-			<key>command</key>
-			<string>executeCommandWithOptions:</string>
-		</dict>
-		<dict>
-			<key>argument</key>
-			<dict>
-				<key>bundlePath</key>
-				<string>/Users/james/Library/Application Support/TextMate/Bundles/Ruby Idioms.tmbundle</string>
-				<key>content</key>
-				<string>each_char { |${1:chr}| $0 }</string>
-				<key>scope</key>
-				<string>source.ruby</string>
-				<key>supportPath</key>
-				<string>/Users/james/Library/Application Support/TextMate/Bundles/Ruby Idioms.tmbundle/Support</string>
-				<key>tabTrigger</key>
-				<string>eac-</string>
-				<key>uuid</key>
-				<string>FDD73070-6D32-4301-A86A-C55B77C3D8ED</string>
-			</dict>
-			<key>command</key>
-			<string>insertSnippetWithOptions:</string>
-		</dict>
-	</array>
-	<key>name</key>
-	<string>each_char { |chr| .. }</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>scopeType</key>
-	<string>local</string>
-	<key>tabTrigger</key>
-	<string>eac</string>
-	<key>uuid</key>
-	<string>7E084412-80E6-4B70-8092-C03D1ECE4CD2</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Macros/each_cons(..) { |group| .. }  (eac).plist b/bundles/ruby.tmbundle/Macros/each_cons(..) { |group| .. }  (eac).plist
deleted file mode 100644
index 3bec50ee6..000000000
--- a/bundles/ruby.tmbundle/Macros/each_cons(..) { |group| .. }  (eac).plist	
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>commands</key>
-	<array>
-		<dict>
-			<key>command</key>
-			<string>moveToBeginningOfDocumentAndModifySelection:</string>
-		</dict>
-		<dict>
-			<key>argument</key>
-			<dict>
-				<key>command</key>
-				<string>insert_requires.rb enumerator</string>
-				<key>input</key>
-				<string>selection</string>
-				<key>output</key>
-				<string>insertAsSnippet</string>
-			</dict>
-			<key>command</key>
-			<string>executeCommandWithOptions:</string>
-		</dict>
-		<dict>
-			<key>argument</key>
-			<dict>
-				<key>bundlePath</key>
-				<string>/Users/james/Library/Application Support/TextMate/Bundles/Ruby Idioms.tmbundle</string>
-				<key>content</key>
-				<string>each_cons(${1:2}) { |${2:group}| $0 }</string>
-				<key>scope</key>
-				<string>source.ruby</string>
-				<key>supportPath</key>
-				<string>/Users/james/Library/Application Support/TextMate/Bundles/Ruby Idioms.tmbundle/Support</string>
-				<key>tabTrigger</key>
-				<string>eac-</string>
-				<key>uuid</key>
-				<string>3C04589C-5127-478E-97B3-CA7DD2EA7ECD</string>
-			</dict>
-			<key>command</key>
-			<string>insertSnippetWithOptions:</string>
-		</dict>
-	</array>
-	<key>name</key>
-	<string>each_cons(..) { |group| .. }</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>scopeType</key>
-	<string>local</string>
-	<key>tabTrigger</key>
-	<string>eac</string>
-	<key>uuid</key>
-	<string>EC73D5CC-5F05-46B9-A6F4-82037E4A38C9</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Macros/each_slice(..) { |group| .. }  (eas).plist b/bundles/ruby.tmbundle/Macros/each_slice(..) { |group| .. }  (eas).plist
deleted file mode 100644
index d9540b75a..000000000
--- a/bundles/ruby.tmbundle/Macros/each_slice(..) { |group| .. }  (eas).plist	
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>commands</key>
-	<array>
-		<dict>
-			<key>command</key>
-			<string>moveToBeginningOfDocumentAndModifySelection:</string>
-		</dict>
-		<dict>
-			<key>argument</key>
-			<dict>
-				<key>command</key>
-				<string>insert_requires.rb enumerator</string>
-				<key>input</key>
-				<string>selection</string>
-				<key>output</key>
-				<string>insertAsSnippet</string>
-			</dict>
-			<key>command</key>
-			<string>executeCommandWithOptions:</string>
-		</dict>
-		<dict>
-			<key>argument</key>
-			<dict>
-				<key>bundlePath</key>
-				<string>/Users/james/Library/Application Support/TextMate/Bundles/Ruby Idioms.tmbundle</string>
-				<key>content</key>
-				<string>each_slice(${1:2}) { |${2:group}| $0 }</string>
-				<key>scope</key>
-				<string>source.ruby</string>
-				<key>supportPath</key>
-				<string>/Users/james/Library/Application Support/TextMate/Bundles/Ruby Idioms.tmbundle/Support</string>
-				<key>tabTrigger</key>
-				<string>eas-</string>
-				<key>uuid</key>
-				<string>CD748479-D2A4-4AB5-95BD-4C89512BA210</string>
-			</dict>
-			<key>command</key>
-			<string>insertSnippetWithOptions:</string>
-		</dict>
-	</array>
-	<key>name</key>
-	<string>each_slice(..) { |group| .. }</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>scopeType</key>
-	<string>local</string>
-	<key>tabTrigger</key>
-	<string>eas</string>
-	<key>uuid</key>
-	<string>825B721D-4367-4DF7-98C0-F005695DF9E3</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Macros/extend Forwardable  (Forw).plist b/bundles/ruby.tmbundle/Macros/extend Forwardable  (Forw).plist
deleted file mode 100644
index a2ea671eb..000000000
--- a/bundles/ruby.tmbundle/Macros/extend Forwardable  (Forw).plist	
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>commands</key>
-	<array>
-		<dict>
-			<key>command</key>
-			<string>moveToBeginningOfDocumentAndModifySelection:</string>
-		</dict>
-		<dict>
-			<key>argument</key>
-			<dict>
-				<key>command</key>
-				<string>insert_requires.rb forwardable</string>
-				<key>input</key>
-				<string>selection</string>
-				<key>output</key>
-				<string>insertAsSnippet</string>
-			</dict>
-			<key>command</key>
-			<string>executeCommandWithOptions:</string>
-		</dict>
-		<dict>
-			<key>argument</key>
-			<dict>
-				<key>bundlePath</key>
-				<string>/Users/james/Library/Application Support/TextMate/Bundles/Ruby Idioms.tmbundle</string>
-				<key>content</key>
-				<string>extend Forwardable</string>
-				<key>scope</key>
-				<string>source.ruby</string>
-				<key>supportPath</key>
-				<string>/Users/james/Library/Application Support/TextMate/Bundles/Ruby Idioms.tmbundle/Support</string>
-				<key>tabTrigger</key>
-				<string>Forw-</string>
-				<key>uuid</key>
-				<string>7F46C90A-595B-4B83-A4F7-058F63CE4218</string>
-			</dict>
-			<key>command</key>
-			<string>insertSnippetWithOptions:</string>
-		</dict>
-	</array>
-	<key>name</key>
-	<string>extend Forwardable</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>scopeType</key>
-	<string>local</string>
-	<key>tabTrigger</key>
-	<string>Forw</string>
-	<key>uuid</key>
-	<string>58FDEA60-10AF-4C49-AA09-29B77030DB25</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Macros/map_with_index { |e, i| .. }  (mapwi).plist b/bundles/ruby.tmbundle/Macros/map_with_index { |e, i| .. }  (mapwi).plist
deleted file mode 100644
index 02fb7506b..000000000
--- a/bundles/ruby.tmbundle/Macros/map_with_index { |e, i| .. }  (mapwi).plist	
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>commands</key>
-	<array>
-		<dict>
-			<key>command</key>
-			<string>moveToBeginningOfDocumentAndModifySelection:</string>
-		</dict>
-		<dict>
-			<key>argument</key>
-			<dict>
-				<key>command</key>
-				<string>insert_requires.rb enumerator</string>
-				<key>input</key>
-				<string>selection</string>
-				<key>output</key>
-				<string>insertAsSnippet</string>
-			</dict>
-			<key>command</key>
-			<string>executeCommandWithOptions:</string>
-		</dict>
-		<dict>
-			<key>argument</key>
-			<dict>
-				<key>bundlePath</key>
-				<string>/Users/james/Library/Application Support/TextMate/Bundles/Ruby Idioms.tmbundle</string>
-				<key>content</key>
-				<string>enum_with_index.map { |${1:e}, ${2:i}| $0 }</string>
-				<key>scope</key>
-				<string>source.ruby</string>
-				<key>supportPath</key>
-				<string>/Users/james/Library/Application Support/TextMate/Bundles/Ruby Idioms.tmbundle/Support</string>
-				<key>tabTrigger</key>
-				<string>mapwi-</string>
-				<key>uuid</key>
-				<string>BD4CFD7B-1AC0-4569-9BDA-FD491F41F4E6</string>
-			</dict>
-			<key>command</key>
-			<string>insertSnippetWithOptions:</string>
-		</dict>
-	</array>
-	<key>name</key>
-	<string>map_with_index { |e, i| .. }</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>scopeType</key>
-	<string>local</string>
-	<key>tabTrigger</key>
-	<string>mapwi</string>
-	<key>uuid</key>
-	<string>BFB65D1C-62F1-485D-8A67-3E5A2E55107C</string>
-</dict>
-</plist>
diff --git "a/bundles/ruby.tmbundle/Macros/require_gem \"__\".tmMacro" "b/bundles/ruby.tmbundle/Macros/require_gem \"__\".tmMacro"
deleted file mode 100644
index bc81569d2..000000000
--- "a/bundles/ruby.tmbundle/Macros/require_gem \"__\".tmMacro"	
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>commands</key>
-	<array>
-		<dict>
-			<key>command</key>
-			<string>moveToBeginningOfDocumentAndModifySelection:</string>
-		</dict>
-		<dict>
-			<key>argument</key>
-			<dict>
-				<key>command</key>
-				<string>insert_requires.rb rubygems</string>
-				<key>input</key>
-				<string>selection</string>
-				<key>output</key>
-				<string>insertAsSnippet</string>
-			</dict>
-			<key>command</key>
-			<string>executeCommandWithOptions:</string>
-		</dict>
-		<dict>
-			<key>argument</key>
-			<dict>
-				<key>content</key>
-				<string>require "$0"</string>
-				<key>name</key>
-				<string>require_gem ".."</string>
-				<key>scope</key>
-				<string>source.ruby</string>
-				<key>tabTrigger</key>
-				<string>reqg-</string>
-				<key>uuid</key>
-				<string>34FEBB9F-73CD-4DD4-A0A3-1CF2A5E3DE78</string>
-			</dict>
-			<key>command</key>
-			<string>insertSnippetWithOptions:</string>
-		</dict>
-	</array>
-	<key>name</key>
-	<string>require_gem ".."</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>reqg</string>
-	<key>uuid</key>
-	<string>33969819-62C5-4E03-B824-C2337205F364</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Macros/xmlread(__).tmMacro b/bundles/ruby.tmbundle/Macros/xmlread(__).tmMacro
deleted file mode 100644
index 6efb2ad33..000000000
--- a/bundles/ruby.tmbundle/Macros/xmlread(__).tmMacro
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>commands</key>
-	<array>
-		<dict>
-			<key>command</key>
-			<string>moveToBeginningOfDocumentAndModifySelection:</string>
-		</dict>
-		<dict>
-			<key>argument</key>
-			<dict>
-				<key>command</key>
-				<string>insert_requires.rb rexml/document</string>
-				<key>input</key>
-				<string>selection</string>
-				<key>output</key>
-				<string>insertAsSnippet</string>
-			</dict>
-			<key>command</key>
-			<string>executeCommandWithOptions:</string>
-		</dict>
-		<dict>
-			<key>argument</key>
-			<dict>
-				<key>content</key>
-				<string>REXML::Document.new(File.read(${1:"${2:path/to/file}"}))</string>
-				<key>name</key>
-				<string>xmlread(..)</string>
-				<key>scope</key>
-				<string>source.ruby</string>
-				<key>tabTrigger</key>
-				<string>xml-</string>
-				<key>uuid</key>
-				<string>B904D4AA-D15D-48A4-8EB2-563BAF489332</string>
-			</dict>
-			<key>command</key>
-			<string>insertSnippetWithOptions:</string>
-		</dict>
-	</array>
-	<key>name</key>
-	<string>xmlread(..)</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>xml</string>
-	<key>uuid</key>
-	<string>F6BF907E-FDF7-4D9B-9E57-BE159561349D</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Preferences/Block typing pairs.plist b/bundles/ruby.tmbundle/Preferences/Block typing pairs.plist
deleted file mode 100644
index e13b89029..000000000
--- a/bundles/ruby.tmbundle/Preferences/Block typing pairs.plist	
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>name</key>
-	<string>Typing Pairs: Block Opening</string>
-	<key>scope</key>
-	<string>keyword.control.start-block.ruby, meta.syntax.ruby.start-block</string>
-	<key>settings</key>
-	<dict>
-		<key>smartTypingPairs</key>
-		<array>
-			<array>
-				<string>"</string>
-				<string>"</string>
-			</array>
-			<array>
-				<string>(</string>
-				<string>)</string>
-			</array>
-			<array>
-				<string>{</string>
-				<string>}</string>
-			</array>
-			<array>
-				<string>[</string>
-				<string>]</string>
-			</array>
-			<array>
-				<string>“</string>
-				<string>”</string>
-			</array>
-			<array>
-				<string>|</string>
-				<string>|</string>
-			</array>
-		</array>
-	</dict>
-	<key>uuid</key>
-	<string>6D75102B-6E51-4360-8F12-BE12327B6AE6</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Preferences/Comments.plist b/bundles/ruby.tmbundle/Preferences/Comments.plist
deleted file mode 100644
index 8e0a72e27..000000000
--- a/bundles/ruby.tmbundle/Preferences/Comments.plist
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>name</key>
-	<string>Comments</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>settings</key>
-	<dict>
-		<key>shellVariables</key>
-		<array>
-			<dict>
-				<key>name</key>
-				<string>TM_COMMENT_START</string>
-				<key>value</key>
-				<string># </string>
-			</dict>
-			<dict>
-				<key>name</key>
-				<string>TM_COMMENT_START_2</string>
-				<key>value</key>
-				<string>=begin
-</string>
-			</dict>
-			<dict>
-				<key>name</key>
-				<string>TM_COMMENT_END_2</string>
-				<key>value</key>
-				<string>=end
-</string>
-			</dict>
-		</array>
-	</dict>
-	<key>uuid</key>
-	<string>1D26F26C-C6F7-434F-84F8-FEE895372E8A</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Preferences/Completion: ENV[…] variables.tmPreferences b/bundles/ruby.tmbundle/Preferences/Completion: ENV[…] variables.tmPreferences
deleted file mode 100644
index c0278fc83..000000000
--- a/bundles/ruby.tmbundle/Preferences/Completion: ENV[…] variables.tmPreferences	
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>name</key>
-	<string>Completion: ENV[…] variables</string>
-	<key>scope</key>
-	<string>meta.environment-variable.ruby string.quoted</string>
-	<key>settings</key>
-	<dict>
-		<key>completionCommand</key>
-		<string>env|grep "^$TM_CURRENT_WORD"|sort|cut -d= -f1</string>
-	</dict>
-	<key>uuid</key>
-	<string>1A7701FA-D866-498C-AD4C-7846538DB535</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Preferences/Completion: require strings.tmPreferences b/bundles/ruby.tmbundle/Preferences/Completion: require strings.tmPreferences
deleted file mode 100644
index 60bdb4b76..000000000
--- a/bundles/ruby.tmbundle/Preferences/Completion: require strings.tmPreferences	
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>name</key>
-	<string>Completion: require strings</string>
-	<key>scope</key>
-	<string>meta.require.ruby string.quoted</string>
-	<key>settings</key>
-	<dict>
-		<key>completionCommand</key>
-		<string>#!/usr/bin/env ruby
-		ptrn = /^#{Regexp.escape ENV["TM_CURRENT_WORD"].to_s}[^.]+\..+/
-		puts( $LOAD_PATH.inject([]) do |res, path|
-		res &lt;&lt; Dir.new(path).grep(ptrn) { |file| file[/^[^.]+/] } if File.exists?(path)
-		res
-		end.sort.uniq )</string>
-	</dict>
-	<key>uuid</key>
-	<string>AEDD6A5F-417F-4177-8589-B07518ACA9DE</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Preferences/Miscellaneous.plist b/bundles/ruby.tmbundle/Preferences/Miscellaneous.plist
deleted file mode 100644
index 81bd04023..000000000
--- a/bundles/ruby.tmbundle/Preferences/Miscellaneous.plist
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>name</key>
-	<string>Indent</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>settings</key>
-	<dict>
-		<key>decreaseIndentPattern</key>
-		<string>^\s*([}\]]\s*$|(end|rescue|ensure|else|elsif|when)\b)</string>
-		<key>increaseIndentPattern</key>
-		<string>(?x)^
-    (\s*
-        (module|class|def
-        |unless|if|else|elsif
-        |case|when
-        |begin|rescue|ensure
-        |for|while|until
-        |(?= .*? \b(do|begin|case|if|unless)\b )
-         # the look-ahead above is to quickly discard non-candidates
-         (  "(\\.|[^\\"])*+"        # eat a double quoted string
-         | '(\\.|[^\\'])*+'      # eat a single quoted string
-         |   [^#"']                # eat all but comments and strings
-         )*
-         (                         \s   (do|begin|case)
-         | [-+=&amp;|*/~%^&lt;&gt;~](?&lt;!\$.) \s*+ (if|unless)
-         )
-        )\b
-        (?! [^;]*+ ; .*? \bend\b )
-    |(  "(\\.|[^\\"])*+"            # eat a double quoted string
-     | '(\\.|[^\\'])*+'          # eat a single quoted string
-     |   [^#"']                    # eat all but comments and strings
-     )*
-     ( \{ (?!  [^}]*+ \} )
-     | \[ (?! [^\]]*+ \] )
-     )
-    ).*$</string>
-	</dict>
-	<key>uuid</key>
-	<string>6FEAF60F-F0F3-4618-9259-DE93285F50D1</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Preferences/Symbo List: Method.plist b/bundles/ruby.tmbundle/Preferences/Symbo List: Method.plist
deleted file mode 100644
index 53a5abea1..000000000
--- a/bundles/ruby.tmbundle/Preferences/Symbo List: Method.plist	
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>name</key>
-	<string>Symbol List: Method</string>
-	<key>scope</key>
-	<string>source.ruby meta.function</string>
-	<key>settings</key>
-	<dict>
-		<key>showInSymbolList</key>
-		<integer>1</integer>
-		<key>symbolTransformation</key>
-		<string>s/^\s*def\s+/ /</string>
-	</dict>
-	<key>uuid</key>
-	<string>92E190C9-A861-4025-92D4-D6B5A24C22D4</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Preferences/Symbol List: No Function Call.tmPreferences b/bundles/ruby.tmbundle/Preferences/Symbol List: No Function Call.tmPreferences
deleted file mode 100644
index 0b963aaec..000000000
--- a/bundles/ruby.tmbundle/Preferences/Symbol List: No Function Call.tmPreferences	
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>name</key>
-	<string>Symbol List: No Function Call</string>
-	<key>scope</key>
-	<string>source.ruby meta.function-call entity.name.function</string>
-	<key>settings</key>
-	<dict>
-		<key>showInSymbolList</key>
-		<integer>0</integer>
-	</dict>
-	<key>uuid</key>
-	<string>A5D50494-EB97-48DE-A2BE-322DF52A7A7A</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/# encoding:  UTF-8.tmSnippet b/bundles/ruby.tmbundle/Snippets/# encoding:  UTF-8.tmSnippet
deleted file mode 100644
index 7282c80ec..000000000
--- a/bundles/ruby.tmbundle/Snippets/# encoding:  UTF-8.tmSnippet	
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string># encoding: ${1:UTF-8}
-</string>
-	<key>name</key>
-	<string># encoding: UTF-8</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>utf8</string>
-	<key>uuid</key>
-	<string>B2C3ADE8-E19E-4B87-9C6C-593D490114C7</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/#!;usr;local;bin;ruby -w.plist b/bundles/ruby.tmbundle/Snippets/#!;usr;local;bin;ruby -w.plist
deleted file mode 100644
index 122046007..000000000
--- a/bundles/ruby.tmbundle/Snippets/#!;usr;local;bin;ruby -w.plist	
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>#!/usr/bin/env ruby${TM_RUBY_SWITCHES: -wKU}
-</string>
-	<key>name</key>
-	<string>#!/usr/bin/env ruby -wKU</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>rb</string>
-	<key>uuid</key>
-	<string>A05CBDD6-845D-45EB-94FB-F8787F5456BE</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/060 ruby if else.plist b/bundles/ruby.tmbundle/Snippets/060 ruby if else.plist
deleted file mode 100644
index f72cb4abd..000000000
--- a/bundles/ruby.tmbundle/Snippets/060 ruby if else.plist	
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>if ${1:condition}
-	$2
-else
-	$3
-end</string>
-	<key>name</key>
-	<string>if … else … end</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>ife</string>
-	<key>uuid</key>
-	<string>667082E6-62C3-11D9-B8CF-000D93589AF6</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/070 ruby if.plist b/bundles/ruby.tmbundle/Snippets/070 ruby if.plist
deleted file mode 100644
index 4267dc2e7..000000000
--- a/bundles/ruby.tmbundle/Snippets/070 ruby if.plist	
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>if ${1:condition}
-	$0
-end</string>
-	<key>name</key>
-	<string>if … end</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>if</string>
-	<key>uuid</key>
-	<string>6670835F-62C3-11D9-B8CF-000D93589AF6</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/080 ruby case.plist b/bundles/ruby.tmbundle/Snippets/080 ruby case.plist
deleted file mode 100644
index 35ea34dc6..000000000
--- a/bundles/ruby.tmbundle/Snippets/080 ruby case.plist	
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>case ${1:object}
-when ${2:condition}
-	$0
-end</string>
-	<key>name</key>
-	<string>case … end</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>case</string>
-	<key>uuid</key>
-	<string>667083EE-62C3-11D9-B8CF-000D93589AF6</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/:yields: RDoc comment.tmSnippet b/bundles/ruby.tmbundle/Snippets/:yields: RDoc comment.tmSnippet
deleted file mode 100644
index 7032a491f..000000000
--- a/bundles/ruby.tmbundle/Snippets/:yields: RDoc comment.tmSnippet	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string> :yields: ${0:arguments}</string>
-	<key>name</key>
-	<string>:yields:</string>
-	<key>scope</key>
-	<string>source.ruby comment</string>
-	<key>tabTrigger</key>
-	<string>y</string>
-	<key>uuid</key>
-	<string>ED6368FB-A11D-4622-9F42-7879481094F1</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/Add '# =>' Marker.tmSnippet b/bundles/ruby.tmbundle/Snippets/Add '# =>' Marker.tmSnippet
deleted file mode 100644
index 527879fb1..000000000
--- a/bundles/ruby.tmbundle/Snippets/Add '# =>' Marker.tmSnippet	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string># =&gt; </string>
-	<key>name</key>
-	<string>Add ‘# =&gt;’ Marker</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>#</string>
-	<key>uuid</key>
-	<string>88BC3896-DC39-4307-A271-21D33340F15A</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/Array.new(10) { |i| .. }  (Arr).plist b/bundles/ruby.tmbundle/Snippets/Array.new(10) { |i| .. }  (Arr).plist
deleted file mode 100644
index a407c1247..000000000
--- a/bundles/ruby.tmbundle/Snippets/Array.new(10) { |i| .. }  (Arr).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>Array.new(${1:10}) { ${2/(^(?&lt;var&gt;\s*(?:\*|\*?[a-z_])[a-zA-Z0-9_]*\s*)(,\g&lt;var&gt;)*,?\s*$)|.*/(?1:|)/}${2:i}${2/(^(?&lt;var&gt;\s*(?:\*|\*?[a-z_])[a-zA-Z0-9_]*\s*)(,\g&lt;var&gt;)*,?\s*$)|.*/(?1:| )/}$0 }</string>
-	<key>name</key>
-	<string>Array.new(10) { |i| .. }</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>Array</string>
-	<key>uuid</key>
-	<string>DAE6A754-D906-4763-B816-CE67125CEF08</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/Benchmark_bmbm(__) do __ end.tmSnippet b/bundles/ruby.tmbundle/Snippets/Benchmark_bmbm(__) do __ end.tmSnippet
deleted file mode 100644
index 30d675513..000000000
--- a/bundles/ruby.tmbundle/Snippets/Benchmark_bmbm(__) do __ end.tmSnippet	
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>TESTS = ${1:10_000}
-Benchmark.bmbm do |results|
-  $0
-end</string>
-	<key>name</key>
-	<string>Benchmark.bmbm do .. end</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>bm-</string>
-	<key>uuid</key>
-	<string>942F20E2-C40A-44B8-A3F2-99AAC68CB534</string>
-</dict>
-</plist>
diff --git "a/bundles/ruby.tmbundle/Snippets/Dir.glob(\"..\") do |file| .. end  (Dir).plist" "b/bundles/ruby.tmbundle/Snippets/Dir.glob(\"..\") do |file| .. end  (Dir).plist"
deleted file mode 100644
index 78929d1da..000000000
--- "a/bundles/ruby.tmbundle/Snippets/Dir.glob(\"..\") do |file| .. end  (Dir).plist"	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>Dir.glob(${1:"${2:dir/glob/*}"}) { |${3:file}| $0 }</string>
-	<key>name</key>
-	<string>Dir.glob("..") { |file| .. }</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>Dir</string>
-	<key>uuid</key>
-	<string>332AA973-AA71-48CB-AEE9-1D71E11019AC</string>
-</dict>
-</plist>
diff --git "a/bundles/ruby.tmbundle/Snippets/Dir[\"__\"].tmSnippet" "b/bundles/ruby.tmbundle/Snippets/Dir[\"__\"].tmSnippet"
deleted file mode 100644
index e583af9c0..000000000
--- "a/bundles/ruby.tmbundle/Snippets/Dir[\"__\"].tmSnippet"
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>Dir[${1:"${2:glob/**/*.rb}"}]</string>
-	<key>name</key>
-	<string>Dir[".."]</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>Dir</string>
-	<key>uuid</key>
-	<string>8EBBB26F-980E-404E-8366-74E5772298F6</string>
-</dict>
-</plist>
diff --git "a/bundles/ruby.tmbundle/Snippets/File.foreach (\"..\") do |line| .. end  (File).plist" "b/bundles/ruby.tmbundle/Snippets/File.foreach (\"..\") do |line| .. end  (File).plist"
deleted file mode 100644
index facee8f76..000000000
--- "a/bundles/ruby.tmbundle/Snippets/File.foreach (\"..\") do |line| .. end  (File).plist"	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>File.foreach(${1:"${2:path/to/file}"}) { |${3:line}| $0 }</string>
-	<key>name</key>
-	<string>File.foreach ("..") { |line| .. }</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>File</string>
-	<key>uuid</key>
-	<string>8F594E5E-6F46-4E98-B5FB-1C8F3BA9828F</string>
-</dict>
-</plist>
diff --git "a/bundles/ruby.tmbundle/Snippets/File_open(\"__\") { |file| __ }.tmSnippet" "b/bundles/ruby.tmbundle/Snippets/File_open(\"__\") { |file| __ }.tmSnippet"
deleted file mode 100644
index ec3258ccb..000000000
--- "a/bundles/ruby.tmbundle/Snippets/File_open(\"__\") { |file| __ }.tmSnippet"	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>File.open(${1:"${2:path/to/file}"}${3/(^[rwab+]+$)|.*/(?1:, ")/}${3:w}${3/(^[rwab+]+$)|.*/(?1:")/}) { |${4:file}| $0 }</string>
-	<key>name</key>
-	<string>File.open("..") { |file| .. }</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>File</string>
-	<key>uuid</key>
-	<string>397FA09F-A30F-4EE4-920C-318D5004EE97</string>
-</dict>
-</plist>
diff --git "a/bundles/ruby.tmbundle/Snippets/File_read(\"__\").tmSnippet" "b/bundles/ruby.tmbundle/Snippets/File_read(\"__\").tmSnippet"
deleted file mode 100644
index 1ee4856f7..000000000
--- "a/bundles/ruby.tmbundle/Snippets/File_read(\"__\").tmSnippet"
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>File.read(${1:"${2:path/to/file}"})</string>
-	<key>name</key>
-	<string>File.read("..")</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>File</string>
-	<key>uuid</key>
-	<string>50C56AC8-48F3-42A0-AF10-8164464AFAEF</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/Hash.new { |hash, key| hash[key] = .. }  (Has).plist b/bundles/ruby.tmbundle/Snippets/Hash.new { |hash, key| hash[key] = .. }  (Has).plist
deleted file mode 100644
index c15bdc603..000000000
--- a/bundles/ruby.tmbundle/Snippets/Hash.new { |hash, key| hash[key] = .. }  (Has).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>Hash.new { |${1:hash}, ${2:key}| ${1:hash}[${2:key}] = $0 }</string>
-	<key>name</key>
-	<string>Hash.new { |hash, key| hash[key] = .. }</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>Hash</string>
-	<key>uuid</key>
-	<string>E16EE658-1CA0-4950-954B-B962E50B754F</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/Insert ERb's <% __ %> or <%= __ %>.tmSnippet b/bundles/ruby.tmbundle/Snippets/Insert ERb's <% __ %> or <%= __ %>.tmSnippet
deleted file mode 100644
index 059584fbe..000000000
--- a/bundles/ruby.tmbundle/Snippets/Insert ERb's <% __ %> or <%= __ %>.tmSnippet	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>&lt;%= ${0:$TM_SELECTED_TEXT} %&gt;</string>
-	<key>keyEquivalent</key>
-	<string>^&gt;</string>
-	<key>name</key>
-	<string>Insert ERb’s &lt;% .. %&gt; or &lt;%= .. %&gt;</string>
-	<key>scope</key>
-	<string>text.html, source.yaml, meta.erb</string>
-	<key>uuid</key>
-	<string>FDFABCB9-DF58-4469-AE11-5407A4FF4D70</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/Marshal.dump(obj, file)  (Md).plist b/bundles/ruby.tmbundle/Snippets/Marshal.dump(obj, file)  (Md).plist
deleted file mode 100644
index 63c6e644e..000000000
--- a/bundles/ruby.tmbundle/Snippets/Marshal.dump(obj, file)  (Md).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>File.open(${1:"${2:path/to/file}.dump"}, "wb") { |${3:file}| Marshal.dump(${4:obj}, ${3:file}) }</string>
-	<key>name</key>
-	<string>Marshal.dump(.., file)</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>Md</string>
-	<key>uuid</key>
-	<string>0CB48BCA-3F6E-4AE0-85BC-08A1D2508216</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/Marshal.load(obj)  (Ml).plist b/bundles/ruby.tmbundle/Snippets/Marshal.load(obj)  (Ml).plist
deleted file mode 100644
index a9d2360c0..000000000
--- a/bundles/ruby.tmbundle/Snippets/Marshal.load(obj)  (Ml).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>File.open(${1:"${2:path/to/file}.dump"}, "rb") { |${3:file}| Marshal.load(${3:file}) }</string>
-	<key>name</key>
-	<string>Marshal.load(obj)</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>Ml</string>
-	<key>uuid</key>
-	<string>20AAD0BC-075D-4EC0-9057-E3E5E62C4125</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/PStore_new( __ ).tmSnippet b/bundles/ruby.tmbundle/Snippets/PStore_new( __ ).tmSnippet
deleted file mode 100644
index 1c0ece8b1..000000000
--- a/bundles/ruby.tmbundle/Snippets/PStore_new( __ ).tmSnippet	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>PStore.new(${1:"${2:file_name.pstore}"})</string>
-	<key>name</key>
-	<string>PStore.new( .. )</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>Pn-</string>
-	<key>uuid</key>
-	<string>5B46ECFD-23A4-4F0C-9951-F64C19C72C2B</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/RDoc documentation block.tmSnippet b/bundles/ruby.tmbundle/Snippets/RDoc documentation block.tmSnippet
deleted file mode 100644
index 743328df6..000000000
--- a/bundles/ruby.tmbundle/Snippets/RDoc documentation block.tmSnippet	
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>`[[ $TM_LINE_INDEX != 0 ]] &amp;&amp; echo; echo`=begin rdoc
-	$0
-=end</string>
-	<key>name</key>
-	<string>New Block</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>=b</string>
-	<key>uuid</key>
-	<string>05984208-D559-4C04-A69C-2019361A985A</string>
-	<key>disableAutoIndent</key>
-	<true />
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/Wrap in Begin … Rescue … End.plist b/bundles/ruby.tmbundle/Snippets/Wrap in Begin … Rescue … End.plist
deleted file mode 100644
index 3c3f8708b..000000000
--- a/bundles/ruby.tmbundle/Snippets/Wrap in Begin … Rescue … End.plist	
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>${TM_SELECTED_TEXT/([\t ]*).*/$1/m}begin
-	${3:${TM_SELECTED_TEXT/(\A.*)|(.+)|\n\z/(?1:$0:(?2:\t$0))/g}}
-${TM_SELECTED_TEXT/([\t ]*).*/$1/m}rescue ${1:Exception}${2/.+/ =&gt; /}${2:e}
-${TM_SELECTED_TEXT/([\t ]*).*/$1/m}	$0
-${TM_SELECTED_TEXT/([\t ]*).*/$1/m}end
-</string>
-	<key>keyEquivalent</key>
-	<string>^W</string>
-	<key>name</key>
-	<string>begin … rescue … end</string>
-	<key>scope</key>
-	<string>source.ruby - comment</string>
-	<key>tabTrigger</key>
-	<string>begin</string>
-	<key>uuid</key>
-	<string>0F940CBC-2173-49FF-B6FD-98A62863F8F2</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/YAML.dump(.., file)  (Yd-).plist b/bundles/ruby.tmbundle/Snippets/YAML.dump(.., file)  (Yd-).plist
deleted file mode 100644
index 2003b259e..000000000
--- a/bundles/ruby.tmbundle/Snippets/YAML.dump(.., file)  (Yd-).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>File.open(${1:"${2:path/to/file}.yaml"}, "w") { |${3:file}| YAML.dump(${4:obj}, ${3:file}) }</string>
-	<key>name</key>
-	<string>YAML.dump(.., file)</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>Yd-</string>
-	<key>uuid</key>
-	<string>3BA6762A-BB6B-489E-8006-F30F386AEF48</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/YAML.load(file)  (Yl-).plist b/bundles/ruby.tmbundle/Snippets/YAML.load(file)  (Yl-).plist
deleted file mode 100644
index 096fc834a..000000000
--- a/bundles/ruby.tmbundle/Snippets/YAML.load(file)  (Yl-).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>File.open(${1:"${2:path/to/file}.yaml"}) { |${3:file}| YAML.load(${3:file}) }</string>
-	<key>name</key>
-	<string>YAML.load(file)</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>Yl-</string>
-	<key>uuid</key>
-	<string>8343ACF4-EEB7-44B5-B835-94826466D4D5</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/__END__.tmSnippet b/bundles/ruby.tmbundle/Snippets/__END__.tmSnippet
deleted file mode 100644
index eb9bf31f5..000000000
--- a/bundles/ruby.tmbundle/Snippets/__END__.tmSnippet
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>__END__
-</string>
-	<key>name</key>
-	<string>__END__</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>end</string>
-	<key>uuid</key>
-	<string>451A0596-1F72-4AFB-AF2F-45900FABB0F7</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/alias_method ..  (am).plist b/bundles/ruby.tmbundle/Snippets/alias_method ..  (am).plist
deleted file mode 100644
index 0813d00aa..000000000
--- a/bundles/ruby.tmbundle/Snippets/alias_method ..  (am).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>alias_method :${1:new_name}, :${0:old_name}</string>
-	<key>name</key>
-	<string>alias_method ..</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>am</string>
-	<key>uuid</key>
-	<string>988C8AEF-FC71-4455-9C4F-9338C05685A4</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/all? { |e| .. }  (all).plist b/bundles/ruby.tmbundle/Snippets/all? { |e| .. }  (all).plist
deleted file mode 100644
index 223f2be88..000000000
--- a/bundles/ruby.tmbundle/Snippets/all? { |e| .. }  (all).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>all? { |${1:e}| $0 }</string>
-	<key>name</key>
-	<string>all? { |e| .. }</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>all</string>
-	<key>uuid</key>
-	<string>07D1F987-7CDB-4EAD-B64A-27A93051700E</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/any? { |e| .. }  (any).plist b/bundles/ruby.tmbundle/Snippets/any? { |e| .. }  (any).plist
deleted file mode 100644
index d6b21091e..000000000
--- a/bundles/ruby.tmbundle/Snippets/any? { |e| .. }  (any).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>any? { |${1:e}| $0 }</string>
-	<key>name</key>
-	<string>any? { |e| .. }</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>any</string>
-	<key>uuid</key>
-	<string>A3B9B76B-2BC5-425C-AB24-9FAAFC375798</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/application_code ..  (app).plist b/bundles/ruby.tmbundle/Snippets/application_code ..  (app).plist
deleted file mode 100644
index 2aaca06f0..000000000
--- a/bundles/ruby.tmbundle/Snippets/application_code ..  (app).plist	
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>if __FILE__ == \$PROGRAM_NAME
-	$0
-end</string>
-	<key>name</key>
-	<string>application { .. }</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>app</string>
-	<key>uuid</key>
-	<string>E16D24D2-CC7E-4786-BE0B-1725FC865D78</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/assert(..)  (as).plist b/bundles/ruby.tmbundle/Snippets/assert(..)  (as).plist
deleted file mode 100644
index 1305934e6..000000000
--- a/bundles/ruby.tmbundle/Snippets/assert(..)  (as).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>assert`snippet_paren.rb`${1:test}, "${0:Failure message.}"`snippet_paren.rb end`</string>
-	<key>name</key>
-	<string>assert(..)</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>as</string>
-	<key>uuid</key>
-	<string>B32C147D-44A6-478A-9D5D-189D7831E9A7</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/assert_equal.tmSnippet b/bundles/ruby.tmbundle/Snippets/assert_equal.tmSnippet
deleted file mode 100644
index c7f218443..000000000
--- a/bundles/ruby.tmbundle/Snippets/assert_equal.tmSnippet
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>assert_equal`snippet_paren.rb`${1:expected}, ${0:actual}`snippet_paren.rb end`</string>
-	<key>name</key>
-	<string>assert_equal(..)</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>ase</string>
-	<key>uuid</key>
-	<string>43A61A22-6BEE-4997-961C-1CDE739C05FE</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/assert_in_delta(..)  (asid).plist b/bundles/ruby.tmbundle/Snippets/assert_in_delta(..)  (asid).plist
deleted file mode 100644
index ac46529c7..000000000
--- a/bundles/ruby.tmbundle/Snippets/assert_in_delta(..)  (asid).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>assert_in_delta`snippet_paren.rb`${1:expected_float}, ${2:actual_float}, ${0:2 ** -20}`snippet_paren.rb end`</string>
-	<key>name</key>
-	<string>assert_in_delta(..)</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>asid</string>
-	<key>uuid</key>
-	<string>429D0EF5-580D-4166-8F79-713DE96B77F1</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/assert_instance_of(..)  (asio).plist b/bundles/ruby.tmbundle/Snippets/assert_instance_of(..)  (asio).plist
deleted file mode 100644
index 3d576c653..000000000
--- a/bundles/ruby.tmbundle/Snippets/assert_instance_of(..)  (asio).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>assert_instance_of`snippet_paren.rb`${1:ExpectedClass}, ${0:actual_instance}`snippet_paren.rb end`</string>
-	<key>name</key>
-	<string>assert_instance_of(..)</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>asio</string>
-	<key>uuid</key>
-	<string>0E831E03-67E1-4357-8323-C60685C23C4F</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/assert_kind_of(..)  (asko).plist b/bundles/ruby.tmbundle/Snippets/assert_kind_of(..)  (asko).plist
deleted file mode 100644
index 3fb833290..000000000
--- a/bundles/ruby.tmbundle/Snippets/assert_kind_of(..)  (asko).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>assert_kind_of`snippet_paren.rb`${1:ExpectedKind}, ${0:actual_instance}`snippet_paren.rb end`</string>
-	<key>name</key>
-	<string>assert_kind_of(..)</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>asko</string>
-	<key>uuid</key>
-	<string>671F05E2-D9CC-485E-BB1B-B13EF20FAC65</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/assert_match(..)  (asm).plist b/bundles/ruby.tmbundle/Snippets/assert_match(..)  (asm).plist
deleted file mode 100644
index e585b0634..000000000
--- a/bundles/ruby.tmbundle/Snippets/assert_match(..)  (asm).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>assert_match`snippet_paren.rb`/${1:expected_pattern}/, ${0:actual_string}`snippet_paren.rb end`</string>
-	<key>name</key>
-	<string>assert_match(..)</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>asm</string>
-	<key>uuid</key>
-	<string>711ED6C3-0F18-41FB-9A7D-3094BB319A85</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/assert_nil(..)  (asn).plist b/bundles/ruby.tmbundle/Snippets/assert_nil(..)  (asn).plist
deleted file mode 100644
index 39c214d2c..000000000
--- a/bundles/ruby.tmbundle/Snippets/assert_nil(..)  (asn).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>assert_nil`snippet_paren.rb`${0:instance}`snippet_paren.rb end`</string>
-	<key>name</key>
-	<string>assert_nil(..)</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>asn</string>
-	<key>uuid</key>
-	<string>4C79256C-480A-459C-BDE8-BB0D972811DB</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/assert_no_match(..)  (asnm).plist b/bundles/ruby.tmbundle/Snippets/assert_no_match(..)  (asnm).plist
deleted file mode 100644
index f116d07d0..000000000
--- a/bundles/ruby.tmbundle/Snippets/assert_no_match(..)  (asnm).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>assert_no_match`snippet_paren.rb`/${1:unexpected_pattern}/, ${0:actual_string}`snippet_paren.rb end`</string>
-	<key>name</key>
-	<string>assert_no_match(..)</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>asnm</string>
-	<key>uuid</key>
-	<string>A072BB1E-1DD1-45D3-9346-8CA3BA21B364</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/assert_not_equal(..)  (asne).plist b/bundles/ruby.tmbundle/Snippets/assert_not_equal(..)  (asne).plist
deleted file mode 100644
index 683044778..000000000
--- a/bundles/ruby.tmbundle/Snippets/assert_not_equal(..)  (asne).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>assert_not_equal`snippet_paren.rb`${1:unexpected}, ${0:actual}`snippet_paren.rb end`</string>
-	<key>name</key>
-	<string>assert_not_equal(..)</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>asne</string>
-	<key>uuid</key>
-	<string>A243E96F-DC21-4AA0-B340-13A7674F6AFF</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/assert_not_nil(..)  (asnn).plist b/bundles/ruby.tmbundle/Snippets/assert_not_nil(..)  (asnn).plist
deleted file mode 100644
index e5b690982..000000000
--- a/bundles/ruby.tmbundle/Snippets/assert_not_nil(..)  (asnn).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>assert_not_nil`snippet_paren.rb`${0:instance}`snippet_paren.rb end`</string>
-	<key>name</key>
-	<string>assert_not_nil(..)</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>asnn</string>
-	<key>uuid</key>
-	<string>79FEC3CC-2A40-4611-9A85-ECDB22FE0701</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/assert_not_same(..)  (asns).plist b/bundles/ruby.tmbundle/Snippets/assert_not_same(..)  (asns).plist
deleted file mode 100644
index 1751c2887..000000000
--- a/bundles/ruby.tmbundle/Snippets/assert_not_same(..)  (asns).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>assert_not_same`snippet_paren.rb`${1:unexpected}, ${0:actual}`snippet_paren.rb end`</string>
-	<key>name</key>
-	<string>assert_not_same(..)</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>asns</string>
-	<key>uuid</key>
-	<string>F91C25EC-EC76-498B-BFB5-FDA8F57C5875</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/assert_nothing_raised(..) { .. }  (asnr).plist b/bundles/ruby.tmbundle/Snippets/assert_nothing_raised(..) { .. }  (asnr).plist
deleted file mode 100644
index 71e570377..000000000
--- a/bundles/ruby.tmbundle/Snippets/assert_nothing_raised(..) { .. }  (asnr).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>assert_nothing_raised(${1:Exception}) { $0 }</string>
-	<key>name</key>
-	<string>assert_nothing_raised(..) { .. }</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>asnr</string>
-	<key>uuid</key>
-	<string>82F8EEE0-2452-411E-8102-7BFDDBCA2E72</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/assert_nothing_thrown { .. }  (asnt).plist b/bundles/ruby.tmbundle/Snippets/assert_nothing_thrown { .. }  (asnt).plist
deleted file mode 100644
index fde48e530..000000000
--- a/bundles/ruby.tmbundle/Snippets/assert_nothing_thrown { .. }  (asnt).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>assert_nothing_thrown { $0 }</string>
-	<key>name</key>
-	<string>assert_nothing_thrown { .. }</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>asnt</string>
-	<key>uuid</key>
-	<string>33639D7A-BD8C-4396-9C44-307B8AC87C9E</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/assert_operator(..)  (aso).plist b/bundles/ruby.tmbundle/Snippets/assert_operator(..)  (aso).plist
deleted file mode 100644
index 63253f281..000000000
--- a/bundles/ruby.tmbundle/Snippets/assert_operator(..)  (aso).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>assert_operator`snippet_paren.rb`${1:left}, :${2:operator}, ${0:right}`snippet_paren.rb end`</string>
-	<key>name</key>
-	<string>assert_operator(..)</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>aso</string>
-	<key>uuid</key>
-	<string>1B925A4D-8EE4-442B-9254-293599F5717F</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/assert_raise(..) { .. }  (asr).plist b/bundles/ruby.tmbundle/Snippets/assert_raise(..) { .. }  (asr).plist
deleted file mode 100644
index 80406001f..000000000
--- a/bundles/ruby.tmbundle/Snippets/assert_raise(..) { .. }  (asr).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>assert_raise(${1:Exception}) { $0 }</string>
-	<key>name</key>
-	<string>assert_raise(..) { .. }</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>asr</string>
-	<key>uuid</key>
-	<string>68B21F6F-5D89-41FA-A19C-F29C2F912B4E</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/assert_respond_to(..)  (asrt).plist b/bundles/ruby.tmbundle/Snippets/assert_respond_to(..)  (asrt).plist
deleted file mode 100644
index 2fc09f114..000000000
--- a/bundles/ruby.tmbundle/Snippets/assert_respond_to(..)  (asrt).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>assert_respond_to`snippet_paren.rb`${1:object}, :${0:method}`snippet_paren.rb end`</string>
-	<key>name</key>
-	<string>assert_respond_to(..)</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>asrt</string>
-	<key>uuid</key>
-	<string>09A11FDA-49FC-4466-8787-8D1D5D111A89</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/assert_same(..)  (ass).plist b/bundles/ruby.tmbundle/Snippets/assert_same(..)  (ass).plist
deleted file mode 100644
index f3191a9d4..000000000
--- a/bundles/ruby.tmbundle/Snippets/assert_same(..)  (ass).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>assert_same`snippet_paren.rb`${1:expected}, ${0:actual}`snippet_paren.rb end`</string>
-	<key>name</key>
-	<string>assert_same(..)</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>ass</string>
-	<key>uuid</key>
-	<string>29340695-E426-4F77-8CF7-C59360A549F4</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/assert_send(..)  (ass).plist b/bundles/ruby.tmbundle/Snippets/assert_send(..)  (ass).plist
deleted file mode 100644
index c0082b615..000000000
--- a/bundles/ruby.tmbundle/Snippets/assert_send(..)  (ass).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>assert_send`snippet_paren.rb`[${1:object}, :${2:message}, ${0:args}]`snippet_paren.rb end`</string>
-	<key>name</key>
-	<string>assert_send(..)</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>ass</string>
-	<key>uuid</key>
-	<string>7850AD5C-A90D-4E2C-A931-EADFF8D3D9A3</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/assert_throws(..) { .. }  (ast).plist b/bundles/ruby.tmbundle/Snippets/assert_throws(..) { .. }  (ast).plist
deleted file mode 100644
index a23e0672d..000000000
--- a/bundles/ruby.tmbundle/Snippets/assert_throws(..) { .. }  (ast).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>assert_throws(:${1:expected}) { $0 }</string>
-	<key>name</key>
-	<string>assert_throws(..) { .. }</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>ast</string>
-	<key>uuid</key>
-	<string>05655BD8-23C6-445F-BFD1-420BF25C3030</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/attr_accessor ..  (rw).plist b/bundles/ruby.tmbundle/Snippets/attr_accessor ..  (rw).plist
deleted file mode 100644
index 0b30409aa..000000000
--- a/bundles/ruby.tmbundle/Snippets/attr_accessor ..  (rw).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>attr_accessor :${0:attr_names}</string>
-	<key>name</key>
-	<string>attr_accessor ..</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>rw</string>
-	<key>uuid</key>
-	<string>D7A7D3C9-1714-4C50-8CC0-D83A03883E8F</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/attr_reader ..  (r).plist b/bundles/ruby.tmbundle/Snippets/attr_reader ..  (r).plist
deleted file mode 100644
index 22436476d..000000000
--- a/bundles/ruby.tmbundle/Snippets/attr_reader ..  (r).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>attr_reader :${0:attr_names}</string>
-	<key>name</key>
-	<string>attr_reader ..</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>r</string>
-	<key>uuid</key>
-	<string>A150C2D8-25B3-4339-BC92-8A0160A70486</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/attr_writer ..  (w).plist b/bundles/ruby.tmbundle/Snippets/attr_writer ..  (w).plist
deleted file mode 100644
index b23ab01ab..000000000
--- a/bundles/ruby.tmbundle/Snippets/attr_writer ..  (w).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>attr_writer :${0:attr_names}</string>
-	<key>name</key>
-	<string>attr_writer ..</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>w</string>
-	<key>uuid</key>
-	<string>3D383096-A03F-4EF8-9060-3C727045AB34</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/class .. < DelegateClass .. initialize .. end  (class).plist b/bundles/ruby.tmbundle/Snippets/class .. < DelegateClass .. initialize .. end  (class).plist
deleted file mode 100644
index 821541c30..000000000
--- a/bundles/ruby.tmbundle/Snippets/class .. < DelegateClass .. initialize .. end  (class).plist	
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>class ${1:${TM_FILENAME/(?:\A|_)([A-Za-z0-9]+)(?:\.rb)?/(?2::\u$1)/g}} &lt; DelegateClass(${2:ParentClass})
-	def initialize${3/(^.*?\S.*)|.*/(?1:\()/}${3:args}${3/(^.*?\S.*)|.*/(?1:\))/}
-		super(${4:del_obj})
-		
-		$0
-	end
-	
-	
-end</string>
-	<key>name</key>
-	<string>class .. &lt; DelegateClass .. initialize .. end</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>cla-</string>
-	<key>uuid</key>
-	<string>AFE1D078-EA16-45F5-AD8A-FAC1B523D861</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/class .. < ParentClass .. initialize .. end.plist b/bundles/ruby.tmbundle/Snippets/class .. < ParentClass .. initialize .. end.plist
deleted file mode 100644
index 9a9deb158..000000000
--- a/bundles/ruby.tmbundle/Snippets/class .. < ParentClass .. initialize .. end.plist	
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>class ${1:${TM_FILENAME/(?:\A|_)([A-Za-z0-9]+)(?:\.rb)?/(?2::\u$1)/g}} &lt; ${2:ParentClass}
-	def initialize${3/(^.*?\S.*)|.*/(?1:\()/}${3:args}${3/(^.*?\S.*)|.*/(?1:\))/}
-		$0
-	end
-	
-	
-end</string>
-	<key>name</key>
-	<string>class .. &lt; ParentClass .. initialize .. end</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>cla</string>
-	<key>uuid</key>
-	<string>0CCBE04E-F4E2-4E55-9506-7DE67ACF8388</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/class .. < Struct .. initialize .. end.plist b/bundles/ruby.tmbundle/Snippets/class .. < Struct .. initialize .. end.plist
deleted file mode 100644
index 9470cf480..000000000
--- a/bundles/ruby.tmbundle/Snippets/class .. < Struct .. initialize .. end.plist	
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>${1:${TM_FILENAME/(?:\A|_)([A-Za-z0-9]+)(?:\.rb)?/(?2::\u$1)/g}} = Struct.new(:${2:attr_names}) do
-	def ${3:method_name}
-		$0
-	end
-	
-	
-end</string>
-	<key>name</key>
-	<string>ClassName = Struct .. do .. end</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>cla</string>
-	<key>uuid</key>
-	<string>05DFF82C-5A29-4EBD-93FE-C165FFFB5EA8</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/class .. < Test;;Unit;;TestCase .. end  (tc).plist b/bundles/ruby.tmbundle/Snippets/class .. < Test;;Unit;;TestCase .. end  (tc).plist
deleted file mode 100644
index 6279a5736..000000000
--- a/bundles/ruby.tmbundle/Snippets/class .. < Test;;Unit;;TestCase .. end  (tc).plist	
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>require "test/unit"
-
-require "${1:library_file_name}"
-
-class Test${2:${1/([\w&amp;&amp;[^_]]+)|./\u$1/g}} &lt; Test::Unit::TestCase
-	def test_${3:case_name}
-		$0
-	end
-end</string>
-	<key>name</key>
-	<string>class .. &lt; Test::Unit::TestCase .. end</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>tc</string>
-	<key>uuid</key>
-	<string>31D1F145-33AB-4441-BA11-4D1C46928C4C</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/class .. end  (cla).plist b/bundles/ruby.tmbundle/Snippets/class .. end  (cla).plist
deleted file mode 100644
index 8839f4cbf..000000000
--- a/bundles/ruby.tmbundle/Snippets/class .. end  (cla).plist	
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>class ${1:${TM_FILENAME/(?:\A|_)([A-Za-z0-9]+)(?:\.rb)?/(?2::\u$1)/g}}
-	$0
-end</string>
-	<key>name</key>
-	<string>class .. end</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>cla</string>
-	<key>uuid</key>
-	<string>BF487539-8085-4FF4-8601-1AD20FABAEDC</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/class .. initialize .. end.plist b/bundles/ruby.tmbundle/Snippets/class .. initialize .. end.plist
deleted file mode 100644
index ac79e1eae..000000000
--- a/bundles/ruby.tmbundle/Snippets/class .. initialize .. end.plist	
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>class ${1:${TM_FILENAME/(?:\A|_)([A-Za-z0-9]+)(?:\.rb)?/(?2::\u$1)/g}}
-	def initialize${2/(^.*?\S.*)|.*/(?1:\()/}${2:args}${2/(^.*?\S.*)|.*/(?1:\))/}
-		$0
-	end
-	
-	
-end</string>
-	<key>name</key>
-	<string>class .. initialize .. end</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>cla</string>
-	<key>uuid</key>
-	<string>83EED068-8C1C-4BAF-9893-902DC00616AB</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/class .. instance_methods .. undef .. initialize .. end  (class).plist b/bundles/ruby.tmbundle/Snippets/class .. instance_methods .. undef .. initialize .. end  (class).plist
deleted file mode 100644
index 171b8c884..000000000
--- a/bundles/ruby.tmbundle/Snippets/class .. instance_methods .. undef .. initialize .. end  (class).plist	
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>class ${1:BlankSlate}
-	instance_methods.each { |meth| undef_method(meth) unless meth =~ /\A__/ }
-	
-	def initialize${2/(^.*?\S.*)|.*/(?1:\()/}${2:args}${2/(^.*?\S.*)|.*/(?1:\))/}
-		@${3:delegate} = ${4:delegate_object}
-		
-		$0
-	end
-	
-	def method_missing(meth, *args, &amp;block)
-		@${3:delegate}.send(meth, *args, &amp;block)
-	end
-	
-	
-end</string>
-	<key>name</key>
-	<string>class BlankSlate .. initialize .. end</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>cla</string>
-	<key>uuid</key>
-	<string>E98FB8F9-7302-431D-8BF2-275A68A6126C</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/class << self __ end.tmSnippet b/bundles/ruby.tmbundle/Snippets/class << self __ end.tmSnippet
deleted file mode 100644
index 9da605c5e..000000000
--- a/bundles/ruby.tmbundle/Snippets/class << self __ end.tmSnippet	
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>class &lt;&lt; ${1:self}
-	$0
-end</string>
-	<key>name</key>
-	<string>class &lt;&lt; self .. end</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>cla</string>
-	<key>uuid</key>
-	<string>C7AAAE45-487A-4B61-8962-D47675AAC05F</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/class_from_name()  (clafn).plist b/bundles/ruby.tmbundle/Snippets/class_from_name()  (clafn).plist
deleted file mode 100644
index 01950c09c..000000000
--- a/bundles/ruby.tmbundle/Snippets/class_from_name()  (clafn).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>split("::").inject(Object) { |par, const| par.const_get(const) }</string>
-	<key>name</key>
-	<string>class_from_name()</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>clafn</string>
-	<key>uuid</key>
-	<string>2DBEE50B-3097-4A57-AB48-3586CF392D8B</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/classify { |e| .. }  (clas).plist b/bundles/ruby.tmbundle/Snippets/classify { |e| .. }  (clas).plist
deleted file mode 100644
index 38d0140ea..000000000
--- a/bundles/ruby.tmbundle/Snippets/classify { |e| .. }  (clas).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>classify { |${1:e}| $0 }</string>
-	<key>name</key>
-	<string>classify { |e| .. }</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>cl</string>
-	<key>uuid</key>
-	<string>5DA9E1E8-2C54-420A-9B84-B040A1AF2B9E</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/collect { |e| .. }  (col).plist b/bundles/ruby.tmbundle/Snippets/collect { |e| .. }  (col).plist
deleted file mode 100644
index 27a46f54e..000000000
--- a/bundles/ruby.tmbundle/Snippets/collect { |e| .. }  (col).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>collect { |${1:e}| $0 }</string>
-	<key>name</key>
-	<string>collect { |e| .. }</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>col</string>
-	<key>uuid</key>
-	<string>669A86AD-936F-4EDA-8E4E-6863804072DA</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/deep_copy(..)  (dee).plist b/bundles/ruby.tmbundle/Snippets/deep_copy(..)  (dee).plist
deleted file mode 100644
index 13bdd5838..000000000
--- a/bundles/ruby.tmbundle/Snippets/deep_copy(..)  (dee).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>Marshal.load(Marshal.dump(${0:obj_to_copy}))</string>
-	<key>name</key>
-	<string>deep_copy(..)</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>deec</string>
-	<key>uuid</key>
-	<string>0BA2B2F1-E767-4A03-9791-0AC0183251F1</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/def end.plist b/bundles/ruby.tmbundle/Snippets/def end.plist
deleted file mode 100644
index 3908170ce..000000000
--- a/bundles/ruby.tmbundle/Snippets/def end.plist	
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>def ${1:method_name}
-	$0
-end</string>
-	<key>name</key>
-	<string>def … end</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>def</string>
-	<key>uuid</key>
-	<string>4E9A7A73-875C-11D9-897C-000393CBCE2E</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/def initialize __ end.tmSnippet b/bundles/ruby.tmbundle/Snippets/def initialize __ end.tmSnippet
deleted file mode 100644
index 129f13cae..000000000
--- a/bundles/ruby.tmbundle/Snippets/def initialize __ end.tmSnippet	
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>def initialize${1/.+/(/}${1:args}${1/.+/)/}
-  $0
-end</string>
-	<key>name</key>
-	<string>def initialize .. end</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>defi</string>
-	<key>uuid</key>
-	<string>4E9D15B5-65D6-4A9A-9DEC-DE041D68C06F</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/def method_missing .. end  (mm).plist b/bundles/ruby.tmbundle/Snippets/def method_missing .. end  (mm).plist
deleted file mode 100644
index cdd874b6b..000000000
--- a/bundles/ruby.tmbundle/Snippets/def method_missing .. end  (mm).plist	
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>def method_missing(meth, *args, &amp;blk)
-	$0
-end</string>
-	<key>name</key>
-	<string>def method_missing .. end</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>defmm</string>
-	<key>uuid</key>
-	<string>87D5F8AD-8DA6-4AED-A0D8-B51CAC980445</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/def self .. end  (defs).plist b/bundles/ruby.tmbundle/Snippets/def self .. end  (defs).plist
deleted file mode 100644
index 07c63bcd7..000000000
--- a/bundles/ruby.tmbundle/Snippets/def self .. end  (defs).plist	
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>def self.${1:class_method_name}
-	$0
-end</string>
-	<key>name</key>
-	<string>def self .. end</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>defs</string>
-	<key>uuid</key>
-	<string>7C6E88FA-CA0E-4110-8C75-A94E54286A75</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/def test_ .. end  (t).plist b/bundles/ruby.tmbundle/Snippets/def test_ .. end  (t).plist
deleted file mode 100644
index 9338f041e..000000000
--- a/bundles/ruby.tmbundle/Snippets/def test_ .. end  (t).plist	
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>def test_${1:case_name}
-	$0
-end</string>
-	<key>name</key>
-	<string>def test_ .. end</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>deft</string>
-	<key>uuid</key>
-	<string>00F66D41-25AF-4597-B67D-E540965A5222</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/def_delegator .. (defd).plist b/bundles/ruby.tmbundle/Snippets/def_delegator .. (defd).plist
deleted file mode 100644
index eac1a966d..000000000
--- a/bundles/ruby.tmbundle/Snippets/def_delegator .. (defd).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>def_delegator :${1:@del_obj}, :${2:del_meth}, :${3:new_name}</string>
-	<key>name</key>
-	<string>def_delegator ..</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>defd</string>
-	<key>uuid</key>
-	<string>C44ED391-614F-4BA2-BB0F-87668EEA9954</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/def_delegators .. (defds).plist b/bundles/ruby.tmbundle/Snippets/def_delegators .. (defds).plist
deleted file mode 100644
index e14ab54dd..000000000
--- a/bundles/ruby.tmbundle/Snippets/def_delegators .. (defds).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>def_delegators :${1:@del_obj}, :${0:del_methods}</string>
-	<key>name</key>
-	<string>def_delegators ..</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>defds</string>
-	<key>uuid</key>
-	<string>4A6EFD6B-88E2-4822-AD48-03460EDBC796</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/define_method ___ end.tmSnippet b/bundles/ruby.tmbundle/Snippets/define_method ___ end.tmSnippet
deleted file mode 100644
index 3d9f84259..000000000
--- a/bundles/ruby.tmbundle/Snippets/define_method ___ end.tmSnippet	
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>define_method :${1:method_name} do${2/.+/ |/}${2:args}${2/.+/|/}
-  $0
-end</string>
-	<key>name</key>
-	<string>define_method ... end</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>defm</string>
-	<key>uuid</key>
-	<string>7BC1E159-0C90-4B0D-8808-80165C11F59C</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/delete_if { |e| .. }  (deli).plist b/bundles/ruby.tmbundle/Snippets/delete_if { |e| .. }  (deli).plist
deleted file mode 100644
index fb90c95f7..000000000
--- a/bundles/ruby.tmbundle/Snippets/delete_if { |e| .. }  (deli).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>delete_if { |${1:e}| $0 }</string>
-	<key>name</key>
-	<string>delete_if { |e| .. }</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>deli</string>
-	<key>uuid</key>
-	<string>263C94DC-63CF-4BA3-9692-C5582CA8F1AB</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/detect { |e| .. }  (det).plist b/bundles/ruby.tmbundle/Snippets/detect { |e| .. }  (det).plist
deleted file mode 100644
index 855fd0afa..000000000
--- a/bundles/ruby.tmbundle/Snippets/detect { |e| .. }  (det).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>detect { |${1:e}| $0 }</string>
-	<key>name</key>
-	<string>detect { |e| .. }</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>det</string>
-	<key>uuid</key>
-	<string>6C6B9849-9631-49FF-A9F9-F0E94A1512C5</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/directory().tmSnippet b/bundles/ruby.tmbundle/Snippets/directory().tmSnippet
deleted file mode 100644
index 635f5d2bb..000000000
--- a/bundles/ruby.tmbundle/Snippets/directory().tmSnippet
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>File.dirname(__FILE__)</string>
-	<key>name</key>
-	<string>directory()</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>dir</string>
-	<key>uuid</key>
-	<string>678BDB83-FBBD-4E8E-BE0B-E1A98AECB247</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/do |obj| .. end (doo).plist b/bundles/ruby.tmbundle/Snippets/do |obj| .. end (doo).plist
deleted file mode 100644
index 3e41d59d5..000000000
--- a/bundles/ruby.tmbundle/Snippets/do |obj| .. end (doo).plist	
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>do${1/(^(?&lt;var&gt;\s*[a-z_][a-zA-Z0-9_]*\s*)(,\g&lt;var&gt;)*,?\s*$)|.*/(?1: |)/}${1:variable}${1/(^(?&lt;var&gt;\s*[a-z_][a-zA-Z0-9_]*\s*)(,\g&lt;var&gt;)*,?\s*$)|.*/(?1:|)/}
-	$0
-end</string>
-	<key>name</key>
-	<string>Insert do |variable| … end</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>do</string>
-	<key>uuid</key>
-	<string>4B72C5C3-6CA7-41AC-B2F9-51DEA25D469E</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/downto(0) { |n| .. }  (dow).plist b/bundles/ruby.tmbundle/Snippets/downto(0) { |n| .. }  (dow).plist
deleted file mode 100644
index 01d7f7bbd..000000000
--- a/bundles/ruby.tmbundle/Snippets/downto(0) { |n| .. }  (dow).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>downto(${1:0}) { ${2/(^(?&lt;var&gt;\s*(?:\*|\*?[a-z_])[a-zA-Z0-9_]*\s*)(,\g&lt;var&gt;)*,?\s*$)|.*/(?1:|)/}${2:n}${2/(^(?&lt;var&gt;\s*(?:\*|\*?[a-z_])[a-zA-Z0-9_]*\s*)(,\g&lt;var&gt;)*,?\s*$)|.*/(?1:| )/}$0 }</string>
-	<key>name</key>
-	<string>downto(0) { |n| .. }</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>dow</string>
-	<key>uuid</key>
-	<string>4991BB86-736E-4758-B9B2-E4FA90B9368F</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/each { |e| .. }  (ea).plist b/bundles/ruby.tmbundle/Snippets/each { |e| .. }  (ea).plist
deleted file mode 100644
index ac3a07392..000000000
--- a/bundles/ruby.tmbundle/Snippets/each { |e| .. }  (ea).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>each { |${1:e}| $0 }</string>
-	<key>name</key>
-	<string>each { |e| .. }</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>ea</string>
-	<key>uuid</key>
-	<string>ECBA4CA0-275F-460E-85BE-E82FEA2E2B26</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/each_byte { |byte| .. }  (eab).plist b/bundles/ruby.tmbundle/Snippets/each_byte { |byte| .. }  (eab).plist
deleted file mode 100644
index ae60e0af6..000000000
--- a/bundles/ruby.tmbundle/Snippets/each_byte { |byte| .. }  (eab).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>each_byte { |${1:byte}| $0 }</string>
-	<key>name</key>
-	<string>each_byte { |byte| .. }</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>eab</string>
-	<key>uuid</key>
-	<string>338EC03D-3FF4-4435-94E8-1CEF20CEC75D</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/each_char { |chr| .. }  (eac-).plist b/bundles/ruby.tmbundle/Snippets/each_char { |chr| .. }  (eac-).plist
deleted file mode 100644
index 7b08ce32d..000000000
--- a/bundles/ruby.tmbundle/Snippets/each_char { |chr| .. }  (eac-).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>each_char { |${1:chr}| $0 }</string>
-	<key>name</key>
-	<string>each_char { |chr| .. }</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>eac-</string>
-	<key>uuid</key>
-	<string>FDD73070-6D32-4301-A86A-C55B77C3D8ED</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/each_cons(..) { |group| .. }  (eac-).plist b/bundles/ruby.tmbundle/Snippets/each_cons(..) { |group| .. }  (eac-).plist
deleted file mode 100644
index f8df1d2d7..000000000
--- a/bundles/ruby.tmbundle/Snippets/each_cons(..) { |group| .. }  (eac-).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>each_cons(${1:2}) { |${2:group}| $0 }</string>
-	<key>name</key>
-	<string>each_cons(..) { |group| .. }</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>eac-</string>
-	<key>uuid</key>
-	<string>3C04589C-5127-478E-97B3-CA7DD2EA7ECD</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/each_index { |i| .. }  (eai).plist b/bundles/ruby.tmbundle/Snippets/each_index { |i| .. }  (eai).plist
deleted file mode 100644
index 5066fef0d..000000000
--- a/bundles/ruby.tmbundle/Snippets/each_index { |i| .. }  (eai).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>each_index { |${1:i}| $0 }</string>
-	<key>name</key>
-	<string>each_index { |i| .. }</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>eai</string>
-	<key>uuid</key>
-	<string>689120C9-AB40-4081-8268-9362E00FA4A0</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/each_key { |key| .. }  (eak).plist b/bundles/ruby.tmbundle/Snippets/each_key { |key| .. }  (eak).plist
deleted file mode 100644
index 8cd5e7a94..000000000
--- a/bundles/ruby.tmbundle/Snippets/each_key { |key| .. }  (eak).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>each_key { |${1:key}| $0 }</string>
-	<key>name</key>
-	<string>each_key { |key| .. }</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>eak</string>
-	<key>uuid</key>
-	<string>E54F7077-3C33-4B53-A4F7-21E16132D3AD</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/each_line { |line| .. }  (eal).plist b/bundles/ruby.tmbundle/Snippets/each_line { |line| .. }  (eal).plist
deleted file mode 100644
index e205a4ba1..000000000
--- a/bundles/ruby.tmbundle/Snippets/each_line { |line| .. }  (eal).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>each_line$1 { |${2:line}| $0 }</string>
-	<key>name</key>
-	<string>each_line { |line| .. }</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>eal</string>
-	<key>uuid</key>
-	<string>02913388-EE8E-4C55-AC94-94F3D751F47E</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/each_pair { |name, val| .. }  (eap).plist b/bundles/ruby.tmbundle/Snippets/each_pair { |name, val| .. }  (eap).plist
deleted file mode 100644
index 223292420..000000000
--- a/bundles/ruby.tmbundle/Snippets/each_pair { |name, val| .. }  (eap).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>each_pair { |${1:name}, ${2:val}| $0 }</string>
-	<key>name</key>
-	<string>each_pair { |name, val| .. }</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>eap</string>
-	<key>uuid</key>
-	<string>7A3CECED-452B-438E-A5C6-95B6BDC43243</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/each_slice { |group| .. }  (eas).plist b/bundles/ruby.tmbundle/Snippets/each_slice { |group| .. }  (eas).plist
deleted file mode 100644
index c5797c88a..000000000
--- a/bundles/ruby.tmbundle/Snippets/each_slice { |group| .. }  (eas).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>each_slice(${1:2}) { |${2:group}| $0 }</string>
-	<key>name</key>
-	<string>each_slice(..) { |group| .. }</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>eas-</string>
-	<key>uuid</key>
-	<string>CD748479-D2A4-4AB5-95BD-4C89512BA210</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/each_value { |val| .. }  (eav).plist b/bundles/ruby.tmbundle/Snippets/each_value { |val| .. }  (eav).plist
deleted file mode 100644
index a42cb675f..000000000
--- a/bundles/ruby.tmbundle/Snippets/each_value { |val| .. }  (eav).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>each_value { |${1:val}| $0 }</string>
-	<key>name</key>
-	<string>each_value { |val| .. }</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>eav</string>
-	<key>uuid</key>
-	<string>844DBD70-BC23-4FBF-9C18-F4A610239DF2</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/each_with_index { |e, i| .. }  (eawi).plist b/bundles/ruby.tmbundle/Snippets/each_with_index { |e, i| .. }  (eawi).plist
deleted file mode 100644
index 6730e1e3b..000000000
--- a/bundles/ruby.tmbundle/Snippets/each_with_index { |e, i| .. }  (eawi).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>each_with_index { |${1:e}, ${2:i}| $0 }</string>
-	<key>name</key>
-	<string>each_with_index { |e, i| .. }</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>eawi</string>
-	<key>uuid</key>
-	<string>1DD13CF5-39C0-4F10-B655-56DACEBC7F94</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/elsif ___.tmSnippet b/bundles/ruby.tmbundle/Snippets/elsif ___.tmSnippet
deleted file mode 100644
index 9028eea1c..000000000
--- a/bundles/ruby.tmbundle/Snippets/elsif ___.tmSnippet	
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>elsif ${1:condition}
-	$0</string>
-	<key>name</key>
-	<string>elsif ...</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>elsif</string>
-	<key>uuid</key>
-	<string>CD1609FA-47DA-4EE4-9C5B-5C56D953F5B1</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/embed string variable.plist b/bundles/ruby.tmbundle/Snippets/embed string variable.plist
deleted file mode 100644
index 397023a7e..000000000
--- a/bundles/ruby.tmbundle/Snippets/embed string variable.plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>#{${1:$TM_SELECTED_TEXT}}</string>
-	<key>keyEquivalent</key>
-	<string>#</string>
-	<key>name</key>
-	<string>Embedded Code — #{…}</string>
-	<key>scope</key>
-	<string>(string.quoted.double.ruby|string.interpolated.ruby) - string source</string>
-	<key>uuid</key>
-	<string>EEE6D060-C5A0-400D-A2E0-0835013C5365</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/extend Forwardable  (Forw).plist b/bundles/ruby.tmbundle/Snippets/extend Forwardable  (Forw).plist
deleted file mode 100644
index d10e907a5..000000000
--- a/bundles/ruby.tmbundle/Snippets/extend Forwardable  (Forw).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>extend Forwardable</string>
-	<key>name</key>
-	<string>extend Forwardable</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>Forw-</string>
-	<key>uuid</key>
-	<string>7F46C90A-595B-4B83-A4F7-058F63CE4218</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/fetch(name) { |key| .. }  (fet).plist b/bundles/ruby.tmbundle/Snippets/fetch(name) { |key| .. }  (fet).plist
deleted file mode 100644
index 7148ace4f..000000000
--- a/bundles/ruby.tmbundle/Snippets/fetch(name) { |key| .. }  (fet).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>fetch(${1:name}) { ${2/(^(?&lt;var&gt;\s*(?:\*|\*?[a-z_])[a-zA-Z0-9_]*\s*)(,\g&lt;var&gt;)*,?\s*$)|.*/(?1:|)/}${2:key}${2/(^(?&lt;var&gt;\s*(?:\*|\*?[a-z_])[a-zA-Z0-9_]*\s*)(,\g&lt;var&gt;)*,?\s*$)|.*/(?1:| )/}$0 }</string>
-	<key>name</key>
-	<string>fetch(name) { |key| .. }</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>fet</string>
-	<key>uuid</key>
-	<string>1F72122A-35AD-4BA1-AA01-889A10319666</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/fill(range) { |i| .. }  (fil).plist b/bundles/ruby.tmbundle/Snippets/fill(range) { |i| .. }  (fil).plist
deleted file mode 100644
index 3fc68b924..000000000
--- a/bundles/ruby.tmbundle/Snippets/fill(range) { |i| .. }  (fil).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>fill(${1:range}) { ${2/(^(?&lt;var&gt;\s*(?:\*|\*?[a-z_])[a-zA-Z0-9_]*\s*)(,\g&lt;var&gt;)*,?\s*$)|.*/(?1:|)/}${2:i}${2/(^(?&lt;var&gt;\s*(?:\*|\*?[a-z_])[a-zA-Z0-9_]*\s*)(,\g&lt;var&gt;)*,?\s*$)|.*/(?1:| )/}$0 }</string>
-	<key>name</key>
-	<string>fill(range) { |i| .. }</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>fil</string>
-	<key>uuid</key>
-	<string>6021BBDC-4AAD-447B-A0C2-A4BB31721558</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/find { |e| .. }  (fin).plist b/bundles/ruby.tmbundle/Snippets/find { |e| .. }  (fin).plist
deleted file mode 100644
index 6dc181a33..000000000
--- a/bundles/ruby.tmbundle/Snippets/find { |e| .. }  (fin).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>find { |${1:e}| $0 }</string>
-	<key>name</key>
-	<string>find { |e| .. }</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>fin</string>
-	<key>uuid</key>
-	<string>E23FE534-8061-4828-98A5-46270B6910B0</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/find_all { |e| .. }  (fina).plist b/bundles/ruby.tmbundle/Snippets/find_all { |e| .. }  (fina).plist
deleted file mode 100644
index a1435b71d..000000000
--- a/bundles/ruby.tmbundle/Snippets/find_all { |e| .. }  (fina).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>find_all { |${1:e}| $0 }</string>
-	<key>name</key>
-	<string>find_all { |e| .. }</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>fina</string>
-	<key>uuid</key>
-	<string>197709C5-8382-4A59-B6D7-31A0CC0F23B7</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/flatten_once  (fla).plist b/bundles/ruby.tmbundle/Snippets/flatten_once  (fla).plist
deleted file mode 100644
index bda4f7778..000000000
--- a/bundles/ruby.tmbundle/Snippets/flatten_once  (fla).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>inject(Array.new) { |${1:arr}, ${2:a}| ${1:arr}.push(*${2:a}) }</string>
-	<key>name</key>
-	<string>flatten_once()</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>flao</string>
-	<key>uuid</key>
-	<string>3DDB99C4-486D-4C11-A217-5680FDD8EC19</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/flunk(..)  (fl).plist b/bundles/ruby.tmbundle/Snippets/flunk(..)  (fl).plist
deleted file mode 100644
index 14283b783..000000000
--- a/bundles/ruby.tmbundle/Snippets/flunk(..)  (fl).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>flunk`snippet_paren.rb`"${1:Failure message.}"`snippet_paren.rb end`$0</string>
-	<key>name</key>
-	<string>flunk(..)</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>flu</string>
-	<key>uuid</key>
-	<string>DB457094-1AC9-4856-AEFC-43A9576B6775</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/grep(;pattern;) { |match| .. }  (gre).plist b/bundles/ruby.tmbundle/Snippets/grep(;pattern;) { |match| .. }  (gre).plist
deleted file mode 100644
index 404abb822..000000000
--- a/bundles/ruby.tmbundle/Snippets/grep(;pattern;) { |match| .. }  (gre).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>grep(${1:/${2:pattern}/}) { |${3:match}| $0 }</string>
-	<key>name</key>
-	<string>grep(/pattern/) { |match| .. }</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>gre</string>
-	<key>uuid</key>
-	<string>9D9E7BA3-8C5D-4532-83EA-326358C2F5BB</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/gsub(;..;) { |match| .. }  (gsu).plist b/bundles/ruby.tmbundle/Snippets/gsub(;..;) { |match| .. }  (gsu).plist
deleted file mode 100644
index 1808257be..000000000
--- a/bundles/ruby.tmbundle/Snippets/gsub(;..;) { |match| .. }  (gsu).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>gsub(/${1:pattern}/) { ${2/(^(?&lt;var&gt;\s*(?:\*|\*?[a-z_])[a-zA-Z0-9_]*\s*)(,\g&lt;var&gt;)*,?\s*$)|.*/(?1:|)/}${2:match}${2/(^(?&lt;var&gt;\s*(?:\*|\*?[a-z_])[a-zA-Z0-9_]*\s*)(,\g&lt;var&gt;)*,?\s*$)|.*/(?1:| )/}$0 }</string>
-	<key>name</key>
-	<string>gsub(/../) { |match| .. }</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>gsu</string>
-	<key>uuid</key>
-	<string>2514FC26-468C-4D08-A788-494A444C4286</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/hash pair (:).plist b/bundles/ruby.tmbundle/Snippets/hash pair (:).plist
deleted file mode 100644
index f26adea4e..000000000
--- a/bundles/ruby.tmbundle/Snippets/hash pair (:).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>:${1:key} =&gt; ${2:"${3:value}"}${4:, }</string>
-	<key>name</key>
-	<string>Hash Pair — :key =&gt; "value"</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>:</string>
-	<key>uuid</key>
-	<string>840B9C4C-7037-4C3B-9028-EB9DC75EDB3E</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/hash pointer.plist b/bundles/ruby.tmbundle/Snippets/hash pointer.plist
deleted file mode 100644
index f91e23a4a..000000000
--- a/bundles/ruby.tmbundle/Snippets/hash pointer.plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string> =&gt; </string>
-	<key>keyEquivalent</key>
-	<string>^l</string>
-	<key>name</key>
-	<string>Hash Pointer — =&gt;</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>uuid</key>
-	<string>B9E3A6DF-875D-11D9-897C-000393CBCE2E</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/include Comparable ..  (Comp).plist b/bundles/ruby.tmbundle/Snippets/include Comparable ..  (Comp).plist
deleted file mode 100644
index 1fc98c2c4..000000000
--- a/bundles/ruby.tmbundle/Snippets/include Comparable ..  (Comp).plist	
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>include Comparable
-
-def &lt;=&gt;(other)
-	$0
-end</string>
-	<key>name</key>
-	<string>include Comparable ..</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>Comp</string>
-	<key>uuid</key>
-	<string>6C9D6B3D-D8E9-4606-9534-577C8D21FFF6</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/include Enumerable ..  (Enum).plist b/bundles/ruby.tmbundle/Snippets/include Enumerable ..  (Enum).plist
deleted file mode 100644
index c35135fb5..000000000
--- a/bundles/ruby.tmbundle/Snippets/include Enumerable ..  (Enum).plist	
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>include Enumerable
-
-def each(&amp;block)
-	$0
-end</string>
-	<key>name</key>
-	<string>include Enumerable ..</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>Enum</string>
-	<key>uuid</key>
-	<string>AAD5D511-6BE7-41DA-8F2B-1593A48FBB08</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/inject(init) { |mem, var| .. }  (inj).plist b/bundles/ruby.tmbundle/Snippets/inject(init) { |mem, var| .. }  (inj).plist
deleted file mode 100644
index d1af9bd85..000000000
--- a/bundles/ruby.tmbundle/Snippets/inject(init) { |mem, var| .. }  (inj).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>inject${1/.+/(/}${1:init}${1/.+/)/} { |${2:mem}, ${3:var}| $0 }</string>
-	<key>name</key>
-	<string>inject(init) { |mem, var| .. }</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>inj</string>
-	<key>uuid</key>
-	<string>B563E0D7-513D-49B4-9733-1B04A6F25A74</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/lambda { |args| .. }  (lam).plist b/bundles/ruby.tmbundle/Snippets/lambda { |args| .. }  (lam).plist
deleted file mode 100644
index 5eaffa23d..000000000
--- a/bundles/ruby.tmbundle/Snippets/lambda { |args| .. }  (lam).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>lambda { ${1/(^(?&lt;var&gt;\s*(?:\*|\*?[a-z_])[a-zA-Z0-9_]*\s*)(,\g&lt;var&gt;)*,?\s*$)|.*/(?1:|)/}${1:args}${1/(^(?&lt;var&gt;\s*(?:\*|\*?[a-z_])[a-zA-Z0-9_]*\s*)(,\g&lt;var&gt;)*,?\s*$)|.*/(?1:| )/}$0 }</string>
-	<key>name</key>
-	<string>lambda { |args| .. }</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>lam</string>
-	<key>uuid</key>
-	<string>21E75321-0CF7-45E8-A297-BCC7C0DDDD15</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/loop { __ }.tmSnippet b/bundles/ruby.tmbundle/Snippets/loop { __ }.tmSnippet
deleted file mode 100644
index 08c78d83f..000000000
--- a/bundles/ruby.tmbundle/Snippets/loop { __ }.tmSnippet	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>loop { $0 }</string>
-	<key>name</key>
-	<string>loop { .. }</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>loo</string>
-	<key>uuid</key>
-	<string>567E3D18-BF2B-4379-8927-2777EC9F495E</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/map { |e| .. }  (map).plist b/bundles/ruby.tmbundle/Snippets/map { |e| .. }  (map).plist
deleted file mode 100644
index f151772de..000000000
--- a/bundles/ruby.tmbundle/Snippets/map { |e| .. }  (map).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>map { |${1:e}| $0 }</string>
-	<key>name</key>
-	<string>map { |e| .. }</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>map</string>
-	<key>uuid</key>
-	<string>5A3754FC-43A3-462B-AB42-E3E951872E6F</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/map_with_index { |e, i| .. }  (mapwi).plist b/bundles/ruby.tmbundle/Snippets/map_with_index { |e, i| .. }  (mapwi).plist
deleted file mode 100644
index 47d8f3c9e..000000000
--- a/bundles/ruby.tmbundle/Snippets/map_with_index { |e, i| .. }  (mapwi).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>enum_with_index.map { |${1:e}, ${2:i}| $0 }</string>
-	<key>name</key>
-	<string>map_with_index { |e, i| .. }</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>mapwi-</string>
-	<key>uuid</key>
-	<string>BD4CFD7B-1AC0-4569-9BDA-FD491F41F4E6</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/max { |a, b| .. }  (max).plist b/bundles/ruby.tmbundle/Snippets/max { |a, b| .. }  (max).plist
deleted file mode 100644
index 2dc65c4dd..000000000
--- a/bundles/ruby.tmbundle/Snippets/max { |a, b| .. }  (max).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>max { |a, b| $0 }</string>
-	<key>name</key>
-	<string>max { |a, b| .. }</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>max</string>
-	<key>uuid</key>
-	<string>98182B9E-7C61-4824-BE4C-9CD69C816037</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/min { |a, b| .. }  (min).plist b/bundles/ruby.tmbundle/Snippets/min { |a, b| .. }  (min).plist
deleted file mode 100644
index 6d746f9d3..000000000
--- a/bundles/ruby.tmbundle/Snippets/min { |a, b| .. }  (min).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>min { |a, b| $0 }</string>
-	<key>name</key>
-	<string>min { |a, b| .. }</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>min</string>
-	<key>uuid</key>
-	<string>CB03D11A-7204-48D0-92C1-E109034403E7</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/module .. ClassMethods .. end.plist b/bundles/ruby.tmbundle/Snippets/module .. ClassMethods .. end.plist
deleted file mode 100644
index 440e60b0c..000000000
--- a/bundles/ruby.tmbundle/Snippets/module .. ClassMethods .. end.plist	
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>module ${1:${TM_FILENAME/(?:\A|_)([A-Za-z0-9]+)(?:\.rb)?/(?2::\u$1)/g}}
-	module ClassMethods
-		$0
-	end
-	
-	module InstanceMethods
-		
-	end
-	
-	def self.included(receiver)
-		receiver.extend         ClassMethods
-		receiver.send :include, InstanceMethods
-	end
-end</string>
-	<key>name</key>
-	<string>module .. ClassMethods .. end</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>mod</string>
-	<key>uuid</key>
-	<string>A71A18CF-2D71-4BFF-AA0C-D9B8C59BC4EB</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/module .. end.plist b/bundles/ruby.tmbundle/Snippets/module .. end.plist
deleted file mode 100644
index 50db6ee1f..000000000
--- a/bundles/ruby.tmbundle/Snippets/module .. end.plist	
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>module ${1:${TM_FILENAME/(?:\A|_)([A-Za-z0-9]+)(?:\.rb)?/(?2::\u$1)/g}}
-	$0
-end</string>
-	<key>name</key>
-	<string>module .. end</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>mod</string>
-	<key>uuid</key>
-	<string>2B73EC5F-06D2-460C-A14F-6FA05AFCF0CC</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/module .. module_function .. end.plist b/bundles/ruby.tmbundle/Snippets/module .. module_function .. end.plist
deleted file mode 100644
index 7a673972f..000000000
--- a/bundles/ruby.tmbundle/Snippets/module .. module_function .. end.plist	
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>module ${1:${TM_FILENAME/(?:\A|_)([A-Za-z0-9]+)(?:\.rb)?/(?2::\u$1)/g}}
-	module_function
-	
-	$0
-end</string>
-	<key>name</key>
-	<string>module .. module_function .. end</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>mod</string>
-	<key>uuid</key>
-	<string>0E85EC81-2FAB-4648-B590-119CC1BB6E41</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/namespace :__ do __ end.tmSnippet b/bundles/ruby.tmbundle/Snippets/namespace :__ do __ end.tmSnippet
deleted file mode 100644
index 03d06c3b5..000000000
--- a/bundles/ruby.tmbundle/Snippets/namespace :__ do __ end.tmSnippet	
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>namespace :${1:${TM_FILENAME/\.\w+//}} do
-	$0
-end</string>
-	<key>name</key>
-	<string>namespace :.. do .. end</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>nam</string>
-	<key>uuid</key>
-	<string>05EE1046-5ED7-48F5-8693-1F066163B2F4</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/open yield block ({).plist b/bundles/ruby.tmbundle/Snippets/open yield block ({).plist
deleted file mode 100644
index febf9899a..000000000
--- a/bundles/ruby.tmbundle/Snippets/open yield block ({).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>{ ${1/(^(?&lt;var&gt;\s*[a-z_][a-zA-Z0-9_]*\s*)(,\g&lt;var&gt;)*,?\s*$)|.*/(?1:|)/}${1:variable}${1/(^(?&lt;var&gt;\s*[a-z_][a-zA-Z0-9_]*\s*)(,\g&lt;var&gt;)*,?\s*$)|.*/(?1:| )/}${2:$TM_SELECTED_TEXT} </string>
-	<key>name</key>
-	<string>Insert { |variable| … }</string>
-	<key>scope</key>
-	<string>source.ruby - string - comment</string>
-	<key>tabTrigger</key>
-	<string>{</string>
-	<key>uuid</key>
-	<string>855FC4EF-7B1E-48EE-AD4E-5ECB8ED79D1C</string>
-</dict>
-</plist>
diff --git "a/bundles/ruby.tmbundle/Snippets/open(\"path;or;url\", \"w\") do |doc| .. end (ope).plist" "b/bundles/ruby.tmbundle/Snippets/open(\"path;or;url\", \"w\") do |doc| .. end (ope).plist"
deleted file mode 100644
index 4863ebb41..000000000
--- "a/bundles/ruby.tmbundle/Snippets/open(\"path;or;url\", \"w\") do |doc| .. end (ope).plist"	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>open(${1:"${2:path/or/url/or/pipe}"}${3/(^[rwab+]+$)|.*/(?1:, ")/}${3:w}${3/(^[rwab+]+$)|.*/(?1:")/}) { |${4:io}| $0 }</string>
-	<key>name</key>
-	<string>open("path/or/url", "w") { |io| .. }</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>ope</string>
-	<key>uuid</key>
-	<string>418F1817-255F-430A-B09A-222964ED66A7</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/option_parse { .. }  (optp).plist b/bundles/ruby.tmbundle/Snippets/option_parse { .. }  (optp).plist
deleted file mode 100644
index dc144ecb9..000000000
--- a/bundles/ruby.tmbundle/Snippets/option_parse { .. }  (optp).plist	
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>require "optparse"
-
-options = {${1::default =&gt; "args"}}
-
-ARGV.options do |opts|
-	opts.banner = "Usage:  #{File.basename(\$PROGRAM_NAME)} [OPTIONS]${2/^\s*$|(.*\S.*)/(?1: )/}${2:OTHER_ARGS}"
-	
-	opts.separator ""
-	opts.separator "Specific Options:"
-	
-	$0
-	
-	opts.separator "Common Options:"
-	
-	opts.on( "-h", "--help",
-	         "Show this message." ) do
-		puts opts
-		exit
-	end
-	
-	begin
-		opts.parse!
-	rescue
-		puts opts
-		exit
-	end
-end
-</string>
-	<key>name</key>
-	<string>option_parse { .. }</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>optp</string>
-	<key>uuid</key>
-	<string>C3C48948-4F49-484E-A8DE-DEB44723099E</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/partition { |e| .. }  (par).plist b/bundles/ruby.tmbundle/Snippets/partition { |e| .. }  (par).plist
deleted file mode 100644
index 0f4195d9f..000000000
--- a/bundles/ruby.tmbundle/Snippets/partition { |e| .. }  (par).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>partition { |${1:e}| $0 }</string>
-	<key>name</key>
-	<string>partition { |e| .. }</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>par</string>
-	<key>uuid</key>
-	<string>52B8BF63-F09E-4789-8407-06168A8AE666</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/pass(__).tmSnippet b/bundles/ruby.tmbundle/Snippets/pass(__).tmSnippet
deleted file mode 100644
index fdf055eb6..000000000
--- a/bundles/ruby.tmbundle/Snippets/pass(__).tmSnippet
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>pass`snippet_paren.rb`"${1:Message.}"`snippet_paren.rb end`$0</string>
-	<key>name</key>
-	<string>pass(..)</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>pas</string>
-	<key>uuid</key>
-	<string>F46A4687-E52D-40D2-9072-C215645EDBC6</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/path_from_here( __ ).tmSnippet b/bundles/ruby.tmbundle/Snippets/path_from_here( __ ).tmSnippet
deleted file mode 100644
index 810b0bbb4..000000000
--- a/bundles/ruby.tmbundle/Snippets/path_from_here( __ ).tmSnippet	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>File.join(File.dirname(__FILE__), *%w[${1:rel path here}])</string>
-	<key>name</key>
-	<string>path_from_here( .. )</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>patfh</string>
-	<key>uuid</key>
-	<string>A4E89D97-D5ED-48BB-B5FF-1BFB79211FCD</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/randomize  (ran).plist b/bundles/ruby.tmbundle/Snippets/randomize  (ran).plist
deleted file mode 100644
index 350e2cfbf..000000000
--- a/bundles/ruby.tmbundle/Snippets/randomize  (ran).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>sort_by { rand }</string>
-	<key>name</key>
-	<string>randomize()</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>ran</string>
-	<key>uuid</key>
-	<string>B0CE57EC-FB2E-4482-8CCE-448DC2588715</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/reject { |e| .. }  (rej).plist b/bundles/ruby.tmbundle/Snippets/reject { |e| .. }  (rej).plist
deleted file mode 100644
index 4405e7f43..000000000
--- a/bundles/ruby.tmbundle/Snippets/reject { |e| .. }  (rej).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>reject { |${1:e}| $0 }</string>
-	<key>name</key>
-	<string>reject { |e| .. }</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>rej</string>
-	<key>uuid</key>
-	<string>B79B9DAB-ABEF-44F6-BF7E-635E7BA11DFD</string>
-</dict>
-</plist>
diff --git "a/bundles/ruby.tmbundle/Snippets/require \"..\"  (req).plist" "b/bundles/ruby.tmbundle/Snippets/require \"..\"  (req).plist"
deleted file mode 100644
index ec8d2656e..000000000
--- "a/bundles/ruby.tmbundle/Snippets/require \"..\"  (req).plist"	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>require "$0"</string>
-	<key>name</key>
-	<string>require ".."</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>req</string>
-	<key>uuid</key>
-	<string>97DE939B-D243-4D5C-B953-1C9090912E7C</string>
-</dict>
-</plist>
diff --git "a/bundles/ruby.tmbundle/Snippets/require \"tc_..\" ..  (ts).plist" "b/bundles/ruby.tmbundle/Snippets/require \"tc_..\" ..  (ts).plist"
deleted file mode 100644
index 376ba0581..000000000
--- "a/bundles/ruby.tmbundle/Snippets/require \"tc_..\" ..  (ts).plist"	
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>require "test/unit"
-
-require "tc_${1:test_case_file}"
-require "tc_${2:test_case_file}"
-</string>
-	<key>name</key>
-	<string>require "tc_.." ..</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>ts</string>
-	<key>uuid</key>
-	<string>5297FD0C-98B1-4514-BBD1-1516810BECA6</string>
-</dict>
-</plist>
diff --git "a/bundles/ruby.tmbundle/Snippets/require_gem \"__\".tmSnippet" "b/bundles/ruby.tmbundle/Snippets/require_gem \"__\".tmSnippet"
deleted file mode 100644
index fb4ff9d06..000000000
--- "a/bundles/ruby.tmbundle/Snippets/require_gem \"__\".tmSnippet"	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>require "$0"</string>
-	<key>name</key>
-	<string>require_gem ".."</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>reqg-</string>
-	<key>uuid</key>
-	<string>34FEBB9F-73CD-4DD4-A0A3-1CF2A5E3DE78</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/results_report(__) { __ }.tmSnippet b/bundles/ruby.tmbundle/Snippets/results_report(__) { __ }.tmSnippet
deleted file mode 100644
index ece0ac97f..000000000
--- a/bundles/ruby.tmbundle/Snippets/results_report(__) { __ }.tmSnippet	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>results.report("${1:name}:") { TESTS.times { $0 } }</string>
-	<key>name</key>
-	<string>results.report(..) { .. }</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>rep</string>
-	<key>uuid</key>
-	<string>1C60D589-DD46-4109-90CA-6B34AEA2F298</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/reverse_each { |e| .. }  (rea).plist b/bundles/ruby.tmbundle/Snippets/reverse_each { |e| .. }  (rea).plist
deleted file mode 100644
index 79adc1533..000000000
--- a/bundles/ruby.tmbundle/Snippets/reverse_each { |e| .. }  (rea).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>reverse_each { |${1:e}| $0 }</string>
-	<key>name</key>
-	<string>reverse_each { |e| .. }</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>reve</string>
-	<key>uuid</key>
-	<string>F3C5F719-EF03-4FF7-A777-4A8402FE3B6B</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/scan(;..;) { |match| .. }  (sca).plist b/bundles/ruby.tmbundle/Snippets/scan(;..;) { |match| .. }  (sca).plist
deleted file mode 100644
index c79bb9ac1..000000000
--- a/bundles/ruby.tmbundle/Snippets/scan(;..;) { |match| .. }  (sca).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>scan(/${1:pattern}/) { |${2:match}| $0 }</string>
-	<key>name</key>
-	<string>scan(/../) { |match| .. }</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>sca</string>
-	<key>uuid</key>
-	<string>66802933-B49F-479B-9DF9-1D898FF1FA90</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/select { |e| .. }  (sel).plist b/bundles/ruby.tmbundle/Snippets/select { |e| .. }  (sel).plist
deleted file mode 100644
index a911413c0..000000000
--- a/bundles/ruby.tmbundle/Snippets/select { |e| .. }  (sel).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>select { |${1:e}| $0 }</string>
-	<key>name</key>
-	<string>select { |e| .. }</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>sel</string>
-	<key>uuid</key>
-	<string>4E409AA4-E7D4-46B7-A4E9-E32F992B33E9</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/singleton_class().tmSnippet b/bundles/ruby.tmbundle/Snippets/singleton_class().tmSnippet
deleted file mode 100644
index 29178d816..000000000
--- a/bundles/ruby.tmbundle/Snippets/singleton_class().tmSnippet
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>class &lt;&lt; self; self end</string>
-	<key>name</key>
-	<string>singleton_class()</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>sinc</string>
-	<key>uuid</key>
-	<string>B46D35B8-5DEB-4C10-A110-BA1965A2EB9C</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/skip(__).tmSnippet b/bundles/ruby.tmbundle/Snippets/skip(__).tmSnippet
deleted file mode 100644
index 5e8da0f1e..000000000
--- a/bundles/ruby.tmbundle/Snippets/skip(__).tmSnippet
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>skip`snippet_paren.rb`"${1:Message.}"`snippet_paren.rb end`$0</string>
-	<key>name</key>
-	<string>skip(..)</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>ski</string>
-	<key>uuid</key>
-	<string>B186BAC0-D981-41AC-B8F4-34BAD2BC4EE6</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/sort { |a, b| .. }  (sor).plist b/bundles/ruby.tmbundle/Snippets/sort { |a, b| .. }  (sor).plist
deleted file mode 100644
index 91225fe37..000000000
--- a/bundles/ruby.tmbundle/Snippets/sort { |a, b| .. }  (sor).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>sort { |a, b| $0 }</string>
-	<key>name</key>
-	<string>sort { |a, b| .. }</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>sor</string>
-	<key>uuid</key>
-	<string>9E0B4D4B-2956-4B3A-800A-3D8CE54E66BF</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/sort_by { |e| .. }  (sorb).plist b/bundles/ruby.tmbundle/Snippets/sort_by { |e| .. }  (sorb).plist
deleted file mode 100644
index 5fe80040d..000000000
--- a/bundles/ruby.tmbundle/Snippets/sort_by { |e| .. }  (sorb).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>sort_by { |${1:e}| $0 }</string>
-	<key>name</key>
-	<string>sort_by { |e| .. }</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>sorb</string>
-	<key>uuid</key>
-	<string>BA9440C9-36C3-4031-BB61-67B581D5B179</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/step(2) { |e| .. }  (ste).plist b/bundles/ruby.tmbundle/Snippets/step(2) { |e| .. }  (ste).plist
deleted file mode 100644
index 53f711807..000000000
--- a/bundles/ruby.tmbundle/Snippets/step(2) { |e| .. }  (ste).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>step(${1:2}) { ${2/(^(?&lt;var&gt;\s*(?:\*|\*?[a-z_])[a-zA-Z0-9_]*\s*)(,\g&lt;var&gt;)*,?\s*$)|.*/(?1:|)/}${2:n}${2/(^(?&lt;var&gt;\s*(?:\*|\*?[a-z_])[a-zA-Z0-9_]*\s*)(,\g&lt;var&gt;)*,?\s*$)|.*/(?1:| )/}$0 }</string>
-	<key>name</key>
-	<string>step(2) { |e| .. }</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>ste</string>
-	<key>uuid</key>
-	<string>36853A11-0307-4AE7-B835-7CE6358717A5</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/sub(;..;) { |match| .. }  (sub).plist b/bundles/ruby.tmbundle/Snippets/sub(;..;) { |match| .. }  (sub).plist
deleted file mode 100644
index 664f79108..000000000
--- a/bundles/ruby.tmbundle/Snippets/sub(;..;) { |match| .. }  (sub).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>sub(/${1:pattern}/) { ${2/(^(?&lt;var&gt;\s*(?:\*|\*?[a-z_])[a-zA-Z0-9_]*\s*)(,\g&lt;var&gt;)*,?\s*$)|.*/(?1:|)/}${2:match}${2/(^(?&lt;var&gt;\s*(?:\*|\*?[a-z_])[a-zA-Z0-9_]*\s*)(,\g&lt;var&gt;)*,?\s*$)|.*/(?1:| )/}$0 }</string>
-	<key>name</key>
-	<string>sub(/../) { |match| .. }</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>sub</string>
-	<key>uuid</key>
-	<string>8021944C-CEA4-4983-8D1C-78D18D4004A1</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/task :task_name => [:dependent, :tasks] do __ end.tmSnippet b/bundles/ruby.tmbundle/Snippets/task :task_name => [:dependent, :tasks] do __ end.tmSnippet
deleted file mode 100644
index a23be59df..000000000
--- a/bundles/ruby.tmbundle/Snippets/task :task_name => [:dependent, :tasks] do __ end.tmSnippet	
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>desc "${1:Task description}"
-task :${2:${3:task_name} =&gt; ${4:[:${5:dependent, :tasks}]}} do
-	$0
-end</string>
-	<key>name</key>
-	<string>task :task_name =&gt; [:dependent, :tasks] do .. end</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>tas</string>
-	<key>uuid</key>
-	<string>A7BF14E6-59B1-42E5-8755-8A72BF13685E</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/times { |n| .. }  (tim).plist b/bundles/ruby.tmbundle/Snippets/times { |n| .. }  (tim).plist
deleted file mode 100644
index de5c52432..000000000
--- a/bundles/ruby.tmbundle/Snippets/times { |n| .. }  (tim).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>times { ${1/(^(?&lt;var&gt;\s*(?:\*|\*?[a-z_])[a-zA-Z0-9_]*\s*)(,\g&lt;var&gt;)*,?\s*$)|.*/(?1:|)/}${1:n}${1/(^(?&lt;var&gt;\s*(?:\*|\*?[a-z_])[a-zA-Z0-9_]*\s*)(,\g&lt;var&gt;)*,?\s*$)|.*/(?1:| )/}$0 }</string>
-	<key>name</key>
-	<string>times { |n| .. }</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>tim</string>
-	<key>uuid</key>
-	<string>206D54AF-E67A-4DF0-B7F4-3D42FEB81685</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/transaction( __ ) do __ end.tmSnippet b/bundles/ruby.tmbundle/Snippets/transaction( __ ) do __ end.tmSnippet
deleted file mode 100644
index 78506b545..000000000
--- a/bundles/ruby.tmbundle/Snippets/transaction( __ ) do __ end.tmSnippet	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>transaction${1/(^.*?\S.*)|.*/(?1:\()/}${1:true}${1/(^.*?\S.*)|.*/(?1:\))/} { $0 }</string>
-	<key>name</key>
-	<string>transaction( .. ) { .. }</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>tra</string>
-	<key>uuid</key>
-	<string>46BF99AD-E172-4D49-BCF7-072F4730E1D9</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/unix_filter .. (uni).plist b/bundles/ruby.tmbundle/Snippets/unix_filter .. (uni).plist
deleted file mode 100644
index d6ede306a..000000000
--- a/bundles/ruby.tmbundle/Snippets/unix_filter .. (uni).plist	
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>ARGF.each_line$1 do |${2:line}|
-	$0
-end</string>
-	<key>name</key>
-	<string>unix_filter { .. }</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>unif</string>
-	<key>uuid</key>
-	<string>8CEF9711-88D5-4202-AFB9-29EF4EFD25C1</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/unless (unless).plist b/bundles/ruby.tmbundle/Snippets/unless (unless).plist
deleted file mode 100644
index 44bd57732..000000000
--- a/bundles/ruby.tmbundle/Snippets/unless (unless).plist	
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>unless ${1:condition}
-	$0
-end</string>
-	<key>name</key>
-	<string>unless … end</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>unless</string>
-	<key>uuid</key>
-	<string>F53E098D-D08E-4CE2-990A-B0BD70E60614</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/until ___ end.tmSnippet b/bundles/ruby.tmbundle/Snippets/until ___ end.tmSnippet
deleted file mode 100644
index 7e0c91739..000000000
--- a/bundles/ruby.tmbundle/Snippets/until ___ end.tmSnippet	
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>until ${1:condition}
-	$0
-end</string>
-	<key>name</key>
-	<string>until ... end</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>until</string>
-	<key>uuid</key>
-	<string>488B387C-50C0-4B2D-9260-5A7E7EAF9B42</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/untitled.plist b/bundles/ruby.tmbundle/Snippets/untitled.plist
deleted file mode 100644
index 6896806c8..000000000
--- a/bundles/ruby.tmbundle/Snippets/untitled.plist
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>opts.on( "-${1:o}", "--${2:long-option-name}"${3/^\s*$|(.*\S.*)/(?1:, )/}${3:String},
-         "${4:Option description.}" ) do |${6:opt}|
-	$0
-end</string>
-	<key>name</key>
-	<string>option(..)</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>opt</string>
-	<key>uuid</key>
-	<string>209D5D73-7A77-4931-A158-3FB6D5B48A88</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/upto(1.0;0.0) { |n| .. }  (upt).plist b/bundles/ruby.tmbundle/Snippets/upto(1.0;0.0) { |n| .. }  (upt).plist
deleted file mode 100644
index 28bdae36c..000000000
--- a/bundles/ruby.tmbundle/Snippets/upto(1.0;0.0) { |n| .. }  (upt).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>upto(${1:1.0/0.0}) { ${2/(^(?&lt;var&gt;\s*(?:\*|\*?[a-z_])[a-zA-Z0-9_]*\s*)(,\g&lt;var&gt;)*,?\s*$)|.*/(?1:|)/}${2:n}${2/(^(?&lt;var&gt;\s*(?:\*|\*?[a-z_])[a-zA-Z0-9_]*\s*)(,\g&lt;var&gt;)*,?\s*$)|.*/(?1:| )/}$0 }</string>
-	<key>name</key>
-	<string>upto(1.0/0.0) { |n| .. }</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>upt</string>
-	<key>uuid</key>
-	<string>51954118-81D7-42B6-9A10-BE23D8B9FFE2</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/usage_if()  (usai).plist b/bundles/ruby.tmbundle/Snippets/usage_if()  (usai).plist
deleted file mode 100644
index 5926f3d1e..000000000
--- a/bundles/ruby.tmbundle/Snippets/usage_if()  (usai).plist	
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>if ARGV.$1
-	abort "Usage:  #{\$PROGRAM_NAME} ${2:ARGS_GO_HERE}"
-end</string>
-	<key>name</key>
-	<string>usage_if()</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>usai</string>
-	<key>uuid</key>
-	<string>21C0D711-F32A-4665-AA0D-B136F9DD3945</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/usage_unless()  (usau).plist b/bundles/ruby.tmbundle/Snippets/usage_unless()  (usau).plist
deleted file mode 100644
index 7292cc24b..000000000
--- a/bundles/ruby.tmbundle/Snippets/usage_unless()  (usau).plist	
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>unless ARGV.$1
-	abort "Usage:  #{\$PROGRAM_NAME} ${2:ARGS_GO_HERE}"
-end</string>
-	<key>name</key>
-	<string>usage_unless()</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>usau</string>
-	<key>uuid</key>
-	<string>49D69DEC-6991-49F4-8D9B-BA60BFDD3D17</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/when.plist b/bundles/ruby.tmbundle/Snippets/when.plist
deleted file mode 100644
index 0dd73244a..000000000
--- a/bundles/ruby.tmbundle/Snippets/when.plist
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>when ${1:condition}
-	$0</string>
-	<key>name</key>
-	<string>when …</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>when</string>
-	<key>uuid</key>
-	<string>48D8E498-C9A5-4B1B-9A18-71A5860276FB</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/while ___ end.tmSnippet b/bundles/ruby.tmbundle/Snippets/while ___ end.tmSnippet
deleted file mode 100644
index 700521895..000000000
--- a/bundles/ruby.tmbundle/Snippets/while ___ end.tmSnippet	
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>while ${1:condition}
-	$0
-end</string>
-	<key>name</key>
-	<string>while ... end</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>while</string>
-	<key>uuid</key>
-	<string>D121FC61-96A4-4B8F-8709-280EDA876FF3</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/xmlread(__).tmSnippet b/bundles/ruby.tmbundle/Snippets/xmlread(__).tmSnippet
deleted file mode 100644
index c45ac9c7a..000000000
--- a/bundles/ruby.tmbundle/Snippets/xmlread(__).tmSnippet
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>REXML::Document.new(File.read(${1:"${2:path/to/file}"}))</string>
-	<key>name</key>
-	<string>xmlread(..)</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>xml-</string>
-	<key>uuid</key>
-	<string>B904D4AA-D15D-48A4-8EB2-563BAF489332</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/xpath(__) { __ }.tmSnippet b/bundles/ruby.tmbundle/Snippets/xpath(__) { __ }.tmSnippet
deleted file mode 100644
index 93d3c3413..000000000
--- a/bundles/ruby.tmbundle/Snippets/xpath(__) { __ }.tmSnippet	
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>elements.each(${1:"${2://XPath}"}) do |${3:node}|
-	$0
-end</string>
-	<key>name</key>
-	<string>xpath(..) { .. }</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>xpa</string>
-	<key>uuid</key>
-	<string>CC300D44-6C3F-4F6C-A8AB-86F5A2DC57CF</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Snippets/zip(enums) { |row| .. }  (zip).plist b/bundles/ruby.tmbundle/Snippets/zip(enums) { |row| .. }  (zip).plist
deleted file mode 100644
index 068a568e1..000000000
--- a/bundles/ruby.tmbundle/Snippets/zip(enums) { |row| .. }  (zip).plist	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>zip(${1:enums}) { |${2:row}| $0 }</string>
-	<key>name</key>
-	<string>zip(enums) { |row| .. }</string>
-	<key>scope</key>
-	<string>source.ruby</string>
-	<key>tabTrigger</key>
-	<string>zip</string>
-	<key>uuid</key>
-	<string>FD010022-E0E7-44DB-827F-33F7D9310DA2</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Support/RakeMate/rake_mate.rb b/bundles/ruby.tmbundle/Support/RakeMate/rake_mate.rb
deleted file mode 100644
index 8a8ee2347..000000000
--- a/bundles/ruby.tmbundle/Support/RakeMate/rake_mate.rb
+++ /dev/null
@@ -1,100 +0,0 @@
-#!/usr/bin/env ruby
-
-require "#{ENV["TM_SUPPORT_PATH"]}/lib/escape"
-require "#{ENV["TM_SUPPORT_PATH"]}/lib/ui"
-require "#{ENV["TM_SUPPORT_PATH"]}/lib/web_preview"
-
-require "run_rake_task"
-
-require "erb"
-include ERB::Util
-require "pstore"
-
-RAKEMATE_VERSION = "2.0.0".freeze
-DEFAULT_TASK     = "(default task)".freeze
-RAKEFILE_DIR     = (ENV["TM_PROJECT_DIRECTORY"] || ENV["TM_DIRECTORY"]).freeze
-
-def html_error(error)
-  puts error
-  puts "</pre>"
-  html_footer
-  exit
-end
-
-html_header("RakeMate", "Rake")
-puts <<-HTML
-<pre>RakeMate v#{RAKEMATE_VERSION} running on Ruby v#{RUBY_VERSION} (#{ENV["TM_RUBY"].strip})
-&gt;&gt;&gt; #{RAKEFILE_DIR}/Rakefile
-
-HTML
-
-rake = ENV["TM_RAKE"]
-if rake.nil? or not File.exist? rake
-  html_error("Rake not found.  Please set TM_RAKE.")
-end
-
-prefs = PStore.new( File.expand_path( "~/Library/Preferences/" +
-                                      "com.macromates.textmate.run_rake" ) )
-
-Dir.chdir(RAKEFILE_DIR)
-tasks = fetch_rake_tasks
-
-unless $?.exited?
-  html_error("Could not fetch task list.")
-end
-if tasks.include? "No Rakefile found"
-  html_error("Could not locate a Rakefile in #{RAKEFILE_DIR}.")
-end
-
-tasks = [DEFAULT_TASK] + tasks.grep(/^rake\s+(\S+)/) { |t| t.split[1] }
-if last_task = tasks.index(prefs.transaction(true) { prefs[RAKEFILE_DIR] })
-  tasks.unshift(tasks.slice!(last_task))
-end
-
-if task = TextMate::UI.request_item( :title   => "Rake Tasks",
-                               :prompt  => "Select a task to execute:",
-                               :items   => tasks,
-                               :button1 => "Run Task")
-  prefs.transaction { prefs[RAKEFILE_DIR] = task }
-
-  testing = task =~ /test/i || task == DEFAULT_TASK
-  run_rake_task(task == DEFAULT_TASK ? nil : task) do |line, mode|
-    if testing and line =~ /^\d+ tests, \d+ assertions, (\d+) failures, (\d+) errors/
-      print "<span style=\"color: ",
-            ($1 + $2 == "00" ? "green" : "red"),
-            "\">#{line.chomp}</span><br />"
-    elsif testing and line =~ /^(\s+)(\S.*?):(\d+)(?::in\s*`(.*?)')?/ and File.exist? $2
-      indent, file, line, method = $1, $2, $3, $4
-
-      url, display_name = '', 'untitled document';
-      unless file == "-"
-        url = '&url=file://' + e_url(File.expand_path(file))
-        display_name = File.basename(file)
-      end
-
-      print "#{indent}<a class='near' href='txmt://open?line=#{line + url}'>" +
-            (method ? "method #{h method}" : '<em>at top level</em>') +
-            "</a> in <strong>#{h display_name}</strong> at line #{line}<br/>"
-    elsif mode == :char_by_char
-      if %w[. E F].include? line
-        print line.sub(/^[EF]$/, "<span style=\"color: red\">\\&</span>"),
-              "<br style=\"display: none\"/>"
-      else
-        print htmlize(line)
-        $stdout.flush
-        next :line_by_line
-      end
-    else
-      print htmlize(line)
-    end
-    $stdout.flush
-    if mode == :char_by_char or (testing and line =~ /^Started\s*/)
-      :char_by_char
-    else
-      :line_by_line
-    end
-  end
-end
-
-puts "</pre>"
-html_footer
diff --git a/bundles/ruby.tmbundle/Support/RakeMate/run_rake_task.rb b/bundles/ruby.tmbundle/Support/RakeMate/run_rake_task.rb
deleted file mode 100644
index 04c6efcfd..000000000
--- a/bundles/ruby.tmbundle/Support/RakeMate/run_rake_task.rb
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/usr/bin/env ruby -w
-
-require "#{ENV["TM_SUPPORT_PATH"]}/lib/escape"
-
-class RakeTaskRunner
-  def initialize
-    @mode = :line_by_line
-  end
-  
-  def run(task = nil, *options, &block)
-    build_rake_command(task, *options)
-    
-    open(@command) do |rake_task|
-      if block.nil?
-        rake_task.read
-      else
-        loop do
-          break if rake_task.eof?
-          new_content = @mode == :char_by_char ? rake_task.getc.chr :
-                                                 rake_task.gets
-          @mode       = block.arity == 2       ? block[new_content, @mode] :
-                                                 block[new_content]
-        end
-      end
-    end
-  end
-  
-  private
-  
-  def build_rake_command(task, *options)
-    @command =  "|"
-    @command << ENV["TM_RAKE"] || "rake"
-    @command << " " << e_sh(task) unless task.nil?
-    unless options.empty?
-      @command << " " << options.map { |arg| e_sh(arg) }.join(" ")
-    end
-    @command << " 2>&1"
-  end
-end
-
-def run_rake_task(*args, &block)
-  RakeTaskRunner.new.run(*args, &block)
-end
-
-def fetch_rake_tasks(*args, &block)
-  RakeTaskRunner.new.run("--tasks", *args, &block)
-end
diff --git a/bundles/ruby.tmbundle/Support/RubyMate/catch_exception.rb b/bundles/ruby.tmbundle/Support/RubyMate/catch_exception.rb
deleted file mode 100644
index 84e377eda..000000000
--- a/bundles/ruby.tmbundle/Support/RubyMate/catch_exception.rb
+++ /dev/null
@@ -1,41 +0,0 @@
-# encoding: utf-8
-
-STDOUT.sync = true
-STDERR.sync = true
-
-require 'pathname'
-
-at_exit do
-  if (e = $!) && !e.instance_of?(SystemExit)
-    require "#{ENV['TM_SUPPORT_PATH']}/lib/escape"
-    require "cgi"
-    io = IO.for_fd(ENV['TM_ERROR_FD'].to_i)
-
-    io.write "<div id='exception_report' class='framed'>\n"
-    io.write "<p id='exception'><strong>#{e.class.name}:</strong> #{CGI.escapeHTML e.message.sub(/`(\w+)'/, '‘\1’').sub(/ -- /, ' — ')}</p>\n"
-
-    io.write "<blockquote><table border='0' cellspacing='4' cellpadding='0'>\n"
-
-    e.backtrace.each do |b|
-      if b =~ /(.*?):(\d+)(?::in\s*`(.*?)')?/ then
-        file, line, method = $1, $2, $3
-
-        url, display_name = '', 'untitled document';
-        if file != '-' && File.exists?(file) && !ENV['TM_SCRIPT_IS_UNTITLED'] then
-          file = Pathname.new(file).realpath.to_s
-          url = '&url=file://' + e_url(file)
-          display_name = File.basename(file)
-        end
-          
-        io << "<tr><td><a class='near' href='txmt://open?line=#{line + url}'>"
-        io << (method ? "method #{CGI::escapeHTML method}" : '<em>at top level</em>')
-        io << "</a></td>\n<td>in <strong>#{CGI::escapeHTML display_name}</strong> at line #{line}</td></tr>\n"
-      end
-    end
-    
-    io.write "</table></blockquote></div>"
-    io.flush
-
-    exit!
-  end
-end
diff --git a/bundles/ruby.tmbundle/Support/RubyMate/run_script.rb b/bundles/ruby.tmbundle/Support/RubyMate/run_script.rb
deleted file mode 100755
index d6c6e932d..000000000
--- a/bundles/ruby.tmbundle/Support/RubyMate/run_script.rb
+++ /dev/null
@@ -1,133 +0,0 @@
-require ENV["TM_SUPPORT_PATH"] + "/lib/tm/executor"
-require ENV["TM_SUPPORT_PATH"] + "/lib/tm/save_current_document"
-
-require 'pathname'
-
-TextMate.save_current_document
-
-# For Run focused unit test, find the name of the test the user wishes to run.
-args = [ ]
-if ARGV.first == "--name="
-  n = ENV['TM_LINE_NUMBER'].to_i
-
-  spec, context, name, test_name = nil, nil, nil
-
-  File.open(ENV['TM_FILEPATH']) do |f|
-    # test/unit
-    lines     = f.read.split("\n")[0...n].reverse
-    name      = lines.find { |line| line =~ /^\s*def test[_a-z0-9]*[\?!]?/i }.to_s.sub(/^\s*def (.*?)\s*$/) { $1 }
-    # test helper
-    test_name = $2 || $3 if lines.find { |line| line =~ /^\s*test\s+('(.*)'|"(.*)")+\s*(\{|do)/ }
-    # test/spec.
-    spec      = $3 || $4 if lines.find { |line| line =~ /^\s*(specify|it)\s+('(.*)'|"(.*)")+\s*(\{|do)/ }
-    context   = $3 || $4 if lines.find { |line| line =~ /^\s*(context|describe)\s+('(.*)'|"(.*)")+\s*(\{|do)/ }
-  end
-
-  if name and !name.empty?
-    args << "--name=#{name}"
-  elsif test_name and !test_name.empty?
-    args << "--name=test_#{test_name.gsub(/\s+/,'_')}"
-  elsif spec and !spec.empty? and context and !context.empty?
-    args << %Q{--name="/test_spec \\{.*#{context}\\} \\d{3} \\[#{spec}\\]/"}
-  else
-    puts "Error:  This doesn't appear to be a TestCase or spec."
-    exit
-  end
-end
-
-is_test_script = !(ENV["TM_FILEPATH"].match(/(?:\b|_)(?:tc|ts|test)(?:\b|_)/).nil? and
-  File.read(ENV["TM_FILEPATH"]).match(/\brequire\b.+(?:test\/unit|test_helper)/).nil?)
-
-cmd = [ENV['TM_RUBY'] || 'ruby', '-KU', '-rcatch_exception']
-
-if is_test_script and not ENV['TM_FILE_IS_UNTITLED']
-  path_ary = (ENV['TM_ORIG_FILEPATH'] || ENV['TM_FILEPATH']).split("/")
-  if index = path_ary.rindex("test")
-    test_path = "#{File.join(*path_ary[0..index])}:#{File.join(*path_ary[0..-2])}"
-    lib_path  = File.join( *( path_ary[0..-2] +
-                              [".."] * (path_ary.length - index - 1) ) +
-                              ["lib"] )
-    if File.exist? lib_path
-      cmd << "-I#{lib_path}:#{test_path}"
-    else
-      cmd << "-I#{test_path}"
-    end
-  end
-end
-
-cmd << ENV["TM_FILEPATH"]
-
-def path_to_url_chunk(path)
-  unless path == "untitled"
-    prefix = ''
-    2.times do
-      begin
-        file = Pathname.new(prefix + path).realpath.to_s
-        return "url=file://#{e_url(file)}&amp;"
-      rescue Errno::ENOENT
-        # Hmm lets try to prefix with project directory
-        prefix = "#{ENV['TM_PROJECT_DIRECTORY']}/"
-      end
-    end
-  else
-    ''
-  end
-end
-
-def actual_path_name(path)
-  prefix = ''
-  2.times do
-    begin
-      file = Pathname.new(prefix + path).realpath.to_s
-      url = '&amp;url=file://' + e_url(file)
-      display_name = File.basename(file)
-      return file, url, display_name
-    rescue Errno::ENOENT
-      # Hmm lets try to prefix with project directory
-      prefix = "#{ENV['TM_PROJECT_DIRECTORY']}/"
-    end
-  end
-  return path, '', path
-end
-
-TextMate::Executor.run( cmd, :version_args => ["--version"],
-                             :script_args  => args ) do |line, type|
-  if is_test_script and type == :out
-    if line =~ /\A[.EF]+\Z/
-      line.gsub!(/([.])/, "<span class=\"test ok\">\\1</span>")
-      line.gsub!(/([EF])/, "<span class=\"test fail\">\\1</span>")
-      line + "<br/>\n"
-    else
-      if line =~ /^(\s+)(\S.*?):(\d+)(?::in\s*`(.*?)')?/
-        indent, file, line, method = $1, $2, $3, $4
-        url, display_name = '', 'untitled document';
-        unless file == "untitled"
-          indent += " " if file.sub!(/^\[/, "")
-          if file == '(eval)'
-            display_name = file
-          else
-            file, url, display_name = actual_path_name(file)
-          end
-        end
-        out = indent
-        out += "<a class='near' href='txmt://open?line=#{line + url}'>" unless url.empty?
-        out += (method ? "method #{CGI::escapeHTML method}" : '<em>at top level</em>')
-        out += "</a>" unless url.empty?
-        out += " in <strong>#{CGI::escapeHTML display_name}</strong> at line #{line}<br/>"
-        out
-      elsif line =~ /test\_(should\_[\w\_]+)\((\w+)\)\s+\[([\w\_\/\.]+)\:(\d+)\]\:/ # shoulda 2.11.3 output test_should_fulfill(SomeTest) [test/unit/some_test.rb:42]:
-        spec, mod, file, line = $1, $2, $3, $4
-        spec.gsub!('_',' ')
-        "<span><a href=\"txmt://open?#{path_to_url_chunk(file)}line=#{line}\">#{mod}: #{spec}</a></span>:#{line}<br/>"
-      elsif line =~ /(\[[^\]]+\]\([^)]+\))\s+\[([\w\_\/\.]+)\:(\d+)\]/ # [spec](file) some text [function_name:line_no]
-        spec, file, line = $1, $2, $3, $4
-        "<span><a href=\"txmt://open?#{path_to_url_chunk(file)}line=#{line}\">#{spec}</a></span>:#{line}<br/>"
-      elsif line =~ /([\w\_]+).*\[([\w\_\/\.]+)\:(\d+)\]/   # whatever_message....[function_name/.whatever:line_no]
-        method, file, line = $1, $2, $3
-        "<span><a href=\"txmt://open?#{path_to_url_chunk(file)}line=#{line}\">#{method}</a></span>:#{line}<br/>"
-      elsif line =~ /^\d+ tests, \d+ assertions, (\d+) failures, (\d+) errors\b.*/
-        "<div class=\"test #{$1 + $2 == "00" ? "ok" : "fail"}\">#{$&}</div>\n"
-      end
-    end
-  end
-end
diff --git a/bundles/ruby.tmbundle/Support/RubyMate/test.rb b/bundles/ruby.tmbundle/Support/RubyMate/test.rb
deleted file mode 100644
index a4d207cdf..000000000
--- a/bundles/ruby.tmbundle/Support/RubyMate/test.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-# encoding: utf-8
-
-# p __FILE__, $PROGRAM_NAME
-
-at_exit { puts "I am <at> the exit!" }
-puts "that’s nice"
-STDERR.write "this is my important stuff\n"
-
-system("echo '<strong>bad!</strong>' 1>&2")
-
-require "erb"
-foo = "bar"
-p ERB.new("<%= foo %>").result
-
-def charlie
-  sheen
-end
-
-charlie
diff --git a/bundles/ruby.tmbundle/Support/RubyMate/todo.txt b/bundles/ruby.tmbundle/Support/RubyMate/todo.txt
deleted file mode 100644
index dfca7c101..000000000
--- a/bundles/ruby.tmbundle/Support/RubyMate/todo.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-Syntax Errors
-=============
-Syntax errors will be written to stderr. We should catch these and turn them into clickable links.
-
-
-Exit Status
-===========
-The exit code from the process we span is not shown. This is a limitation of popen3, but we could role a replacement for that.
-
-
-Errors From Included Files
-==========================
-These could be shown differently to make them distinguishable.
diff --git a/bundles/ruby.tmbundle/Support/bin/insert_requires.rb b/bundles/ruby.tmbundle/Support/bin/insert_requires.rb
deleted file mode 100755
index 1baedf379..000000000
--- a/bundles/ruby.tmbundle/Support/bin/insert_requires.rb
+++ /dev/null
@@ -1,104 +0,0 @@
-#!/usr/bin/env ruby
-
-$: << "#{ENV['TM_BUNDLE_SUPPORT']}/lib" if ENV.has_key?('TM_BUNDLE_SUPPORT')
-require "ruby_requires"
-
-code = STDIN.read
-if ARGV.empty?
-  REQUIRES = { "abbrev"           => [/\babbrev\b/],
-               "base64"           => [/\bBase64\b/],
-               "benchmark"        => [/\bBenchmark\b/],
-               "bigdecimal"       => [/\bBigDecimal\b/],
-               "bigdecimal/math"  => [/\bBigMath\b/],
-               "cgi"              => [/\bCGI\b/],
-               "complex"          => [/\bComplex\b/],
-               "csv"              => [/\bCSV\b/],
-               "curses"           => [/\bCurses\b/],
-               "date"             => [/\bDate(?:Time)?\b/],
-               "dbm"              => [/\bDBM\b/],
-               "delegate"         => [ /\bDelegateClass\b/, /\bDelegator\b/,
-                                       /\bSimpleDelegator\b/ ],
-               "digest"           => [/\bMD5\b/, /\bSHA1\b/],
-               "dl"               => [/\bDL\b/],
-               "enumerator"       => [ /\b(?:enum|each)_(?:cons|slice)\b/,
-                                       /\benum_(?:for|with_index)\b/,
-                                       /\bto_enum\b/ ],
-               "erb"              => [/\bERB\b/],
-               "etc"              => [/\bEtc\b/],
-               "fcntl"            => [/\bFcntl\b/],
-               "fileutils"        => [/\bFileUtils\b/],
-               "find"             => [/\bFind(?:\.|::)find\b/],
-               "forwardable"      => [/\b(?:Single)?Forwardable\b/],
-               "gdbm"             => [/\bGDBM\b/],
-               "generator"        => [/\bGenerator\b/, /\bSyncEnumerator\b/],
-               "getoptlong"       => [/\bGetoptLong\b/],
-               "gserver"          => [/\bGServer\b/],
-               "iconv"            => [/\bIconv\b/],
-               "ipaddr"           => [/\bIpAddr\b/],
-               "logger"           => [/\bLogger\b/],
-               "matrix"           => [/\bMatrix\b/, /\bVector\b/],
-               "monitor"          => [/\bMonitor(?:Mixin)?\b/],
-               "net/ftp"          => [/\bNet::FTP\b/],
-               "net/http"         => [/\bNet::HTTP\b/],
-               "net/imap"         => [/\bNet::IMAP\b/],
-               "net/pop"          => [/\bNet::(?:APOP|POP3)\b/],
-               "net/smtp"         => [/\bNet::SMTP\b/],
-               "net/telnet"       => [/\bNet::Telnet\b/],
-               "nkf"              => [/\bNKF\b/],
-               "observer"         => [/\bObservable\b/],
-               "open3"            => [/\bOpen3\b/],
-               "optparse"         => [/\bOptionParser\b/],
-               "ostruct"          => [/\bOpenStruct\b/],
-               "pathname"         => [/\bPathname\b/],
-               "ping"             => [/\bPing\b/],
-               "pp"               => [/\bpp\b/],
-               "pstore"           => [/\bPStore\b/],
-               "rational"         => [/\bRational\b/],
-               "rdoc/usage"       => [/\bRDoc(?:\.|::)usage\b/],
-               "rdoc/markup/simple_markup" \
-                                  => [/\bSM::SimpleMarkup\b/],
-               "rdoc/markup/simple_markup/to_html" \
-                                  => [/\bSM::SimpleMarkup\b/],
-               "rdoc/usage"       => [/\bRDoc(?:\.|::)usage\b/],
-               "resolv"           => [/\bResolv\b/],
-               "rexml/document"   => [/\bREXML\b/],
-               "rinda/tuplespace" => [/\bRinda::TupleSpace(?:Proxy)?\b/],
-               "rinda/ring"       => [/\bRinda::Ring(?:Finger|Server)?\b/],
-               "rss"              => [/\bRSS\b/],
-               "scanf"            => [/\bscanf\b/],
-               "sdbm"             => [/\bSDBM\b/],
-               "set"              => [/\b(?:Sorted)?Set\b/],
-               "singleton"        => [/\bSingleton\b/],
-               "soap"             => [/\bSOAP\b/],
-               "socket"           => [ /\b(?:TCP|UNIX)(?:Socket|Server)\b/,
-                                       /\b(?:UDP)?Socket\b/ ],
-               "stringio"         => [/\bStringIO\b/],
-               "strscan"          => [/\bStringScanner\b/],
-               "syslog"           => [/\bSyslog\b/],
-               "tempfile"         => [/\bTempfile\b/],
-               "test/unit"        => [/\bTest::Unit\b/],
-               "thread"           => [ /\bConditionVariable\b/, /\bMutex\b/,
-                                       /\b(?:Sized)?Queue\b/ ],
-               "time"             => [/\bTime(?:\.|::)parse\b/],
-               "timeout"          => [/\bTimeout(?:\.|::)timeout\b/],
-               "tk"               => [/\bTK\b/],
-               "tmpdir"           => [/\bDir(?:\.|::)tmpdir\b/],
-               "tracer"           => [/\bTracer\b/],
-               "tsort"            => [/\bTSort\b/],
-               "uri"              => [/\bURI\b/],
-               "weakref"          => [/\bWeakRef\b/],
-               "webrick"          => [/\bWEBrick\b/],
-               "Win32API"         => [/\bWin32(?:API)?\b/],
-               "win32ole"         => [/\bWIN32OLE\b/],
-               "wsdl"             => [/\bWSDL\b/],
-               "xmlrpc"           => [/\bXMLRPC\b/],
-               "yaml"             => [/\bYAML\b/],
-               "zlib"             => [/\bZlib\b/] }
-  
-  libs = REQUIRES.select { |lib, usage| usage.any? { |test| code =~ test } }.
-                  map { |kv| kv.first }
-  
-  print RubyRequires.add_requires(code, libs)
-else
-  print RubyRequires.add_requires(code, ARGV)
-end
diff --git a/bundles/ruby.tmbundle/Support/bin/linked_ri.rb b/bundles/ruby.tmbundle/Support/bin/linked_ri.rb
deleted file mode 100755
index 8e85d6093..000000000
--- a/bundles/ruby.tmbundle/Support/bin/linked_ri.rb
+++ /dev/null
@@ -1,153 +0,0 @@
-#!/usr/bin/env ruby -w
-# encoding: utf-8
-
-# if we are not called directly from TM (e.g. JavaScript) the caller
-# should ensure that RUBYLIB is set properly
-$: << "#{ENV["TM_SUPPORT_PATH"]}/lib" if ENV.has_key? "TM_SUPPORT_PATH"
-LINKED_RI = "#{ENV["TM_BUNDLE_SUPPORT"]}/bin/linked_ri.rb"
-
-require "exit_codes"
-require "ui"
-require "web_preview"
-
-require "erb"
-include ERB::Util
-
-RI_EXE = [ ENV['TM_RUBY_RI'], 'qri', 'ri' ].find { |cmd| !cmd.to_s.empty? && (File.executable?(cmd) || ENV['PATH'].split(':').any? { |dir| File.executable? File.join(dir, cmd) }) ? cmd : false }
-
-term = ARGV.shift
-
-# first escape for use in the shell, then escape for use in a JS string
-def e_js_sh(str)
-  (e_sh str).gsub("\\", "\\\\\\\\")
-end
-
-def link_methods(prefix, methods)
-  methods.split(/(,\s*)/).map do |match|
-    match[0] == ?, ?
-      match : "<a href=\"javascript:ri('#{prefix}#{match}')\">#{match}</a>"
-  end.join
-end
-
-def htmlize_ri_output(text, term)
-  text = text.gsub(/&/, '&amp;').gsub(/</, '&lt;')
-
-  text.sub!(/\A(-+\s+Class: )(.*)$\n*/) do
-    "<h2>Class: " + $2.gsub(/([A-Z_]\w*)(\s+&lt;)?/, "<a href=\"javascript:ri('\\1')\">\\1</a>\\2") + "</h2>\n<pre>"
-  end
-
-  text.sub!(/\A(-+\s+)(([A-Z_]\w*::)*[A-Z_]\w*)((#|::|\.).*)$/) do
-    method    = $4
-    namespace = $2.split("::")
-    linked    = (0...namespace.size).map do |i|
-      "<a href=\"javascript:ri('#{namespace[0..i].join('::')}')\">#{namespace[i]}</a>"
-    end
-    "<h2>#{linked.join("::")}#{method}</h2>\n<pre>"
-  end
-
-  text.sub!(/^(Includes:\s+-+\s+)(.+?)([ \t]*\n[ \t]*\n|\s*\Z)/m) do
-    head, meths, foot = $1, $2, $3
-    head + meths.gsub(/([A-Z_]\w*)\(([^)]*)\)/) do |match|
-      "<a href=\"javascript:ri('#{$1}')\">#{$1}</a>(" +
-      link_methods("#{$1}#", $2) + ")"
-    end + foot
-  end
-
-  text.sub!(/^(Class methods:\s+-+\s+)(.+?)([ \t]*\n[ \t]*\n|\s*\Z)/m) do
-    $1 + link_methods("#{term}::", $2) + $3
-  end
-
-  text.sub!(/^(Instance methods:\s+-+\s+)(.+?)([ \t]*\n[ \t]*\n|\s*\Z)/m) do
-    $1 + link_methods("#{term}#", $2) + $3
-  end
-
-  text.gsub!(/(?:\n+-+$)?\n+([\w\s]+)[:.]$\n-+\n+/, "</pre>\n\n<h2>\\1</h2>\n<pre>")
-  text.gsub!(/^-+$/, '<hr>')
-
-  text.chomp + "</pre>"
-end
-
-def ri(term)
-  documentation = `#{e_sh LINKED_RI} '#{term}' 'js' 2>&1` \
-                  rescue "<h1>ri Command Error.</h1>"
-  if documentation =~ /\ACouldn't open the index/
-    TextMate.exit_show_tool_tip(
-      "Index needed by #{RI_EXE} not found.\n" +
-      "You may need to run:\n\n"               +
-      "  fastri-server -b"
-    )
-  elsif documentation =~ /\ACouldn't initialize DRb and locate the Ring server./
-    TextMate.exit_show_tool_tip("Your fastri-server is not running.")
-  elsif documentation =~ /Nothing known about /
-    TextMate.exit_show_tool_tip(documentation)
-  elsif documentation.sub!(/\A>>\s*/, "")
-    choices = documentation.split
-    choice  = TextMate::UI.menu(choices)
-    exit if choice.nil?
-    ri(choices[choice])
-  else
-    [term, documentation]
-  end
-end
-
-mode = ARGV.shift
-if mode.nil? then
-
-  term = STDIN.read.strip
-
-  if term.empty?
-    term = TextMate::UI.request_string( :title => "Ruby Documentation Search",
-                                        :prompt => "Enter a term to search for:",
-                                        :button1 => "search")
-  end
-  
-  TextMate.exit_show_tool_tip("Please select a term to look up.") if term.empty?
-
-  term, documentation = ri(term)
-
-  html_header("Documentation for ‘#{term}’", "RDoc", <<-HTML)
-<script type="text/javascript" charset="utf-8">
-  function ri (arg, _history) {
-    TextMate.isBusy = true;
-    var res = TextMate.system("RUBYLIB=#{e_js_sh "#{ENV['TM_SUPPORT_PATH']}/lib"} #{e_js_sh LINKED_RI} 2>&1 '" + arg + "' 'js'", null).outputString;
-    document.getElementById("actual_output").innerHTML = res;
-    TextMate.isBusy = false;
-    if(!_history)
-    {
-      var history = document.getElementById('search_history');
-      var new_option = document.createElement('option');
-      new_option.setAttribute('value', arg);
-      new_option.appendChild(document.createTextNode(arg));
-      history.appendChild(new_option);
-      history.value = arg;
-    }
-  }
-</script>
-HTML
-  puts <<-HTML
-<select id="search_history" style="float: right;">
-  <option value="#{term}" selected="selected">#{term}</option>
-</select>
-<script type="text/javascript" charset="utf-8">
-  document.getElementById('search_history').addEventListener('change', function(e) {
-    ri(document.getElementById('search_history').value, true);
-  }, false);
-</script>
-<div id="actual_output" style="margin-top: 3em">#{documentation}</div>
-HTML
-  html_footer
-  TextMate.exit_show_html
-elsif mode == 'js' then
-  documentation = `#{e_sh RI_EXE} -T -f plain #{e_sh term}` \
-    rescue "<h1>ri Command Error.</h1>"
-
-  if documentation =~ /\A(?:\s*More than one method matched|-+\s+Multiple choices)/
-    methods       = documentation.split(/\n[ \t]*\n/).last.
-                    strip.split(/(?:,\s*|\n)/).map { |m| m[/\S+/] }.compact
-    documentation = ">> #{methods.join(' ')}"
-  else
-    documentation = htmlize_ri_output(documentation, term)
-  end
-
-  puts documentation
-end
diff --git a/bundles/ruby.tmbundle/Support/bin/make_destructive.rb b/bundles/ruby.tmbundle/Support/bin/make_destructive.rb
deleted file mode 100644
index 153f20876..000000000
--- a/bundles/ruby.tmbundle/Support/bin/make_destructive.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/usr/bin/env ruby
-
-require "escape"
-
-CURSOR = [0xFFFC].pack("U").freeze
-line   = STDIN.read
-begin
-  line[ENV["TM_LINE_INDEX"].to_i, 0] = CURSOR
-rescue
-  exit
-end
-
-line.sub!(/\b(chomp|chop|collect|compact|delete|downcase|exit|flatten|gsub|lstrip|map|next|reject|reverse|rstrip|slice|sort|squeeze|strip|sub|succs|swapcase|tr|tr_s|uniq|upcase)\b(?!\!)/, "\\1!")
-
-line = e_sn(line)
-line.sub!(CURSOR, "$0")
-
-print line
diff --git a/bundles/ruby.tmbundle/Support/bin/snippet_paren.rb b/bundles/ruby.tmbundle/Support/bin/snippet_paren.rb
deleted file mode 100755
index 6b4bbbd39..000000000
--- a/bundles/ruby.tmbundle/Support/bin/snippet_paren.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env ruby -wKU
-
-minimize = ENV["TM_MINIMIZE_PARENS"].to_s =~ /\byes\b/i
-
-case ARGV.shift.to_s =~ /\bend\b/i ? :end : :start
-when :start
-  print(minimize ? " " : "(")
-when :end
-  print ")" unless minimize
-end
diff --git a/bundles/ruby.tmbundle/Support/lib/ruby_requires.rb b/bundles/ruby.tmbundle/Support/lib/ruby_requires.rb
deleted file mode 100644
index c589000a6..000000000
--- a/bundles/ruby.tmbundle/Support/lib/ruby_requires.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/usr/bin/env ruby
-
-$: << "#{ENV['TM_SUPPORT_PATH']}/lib" if ENV.has_key?('TM_SUPPORT_PATH')
-require "escape"
-
-module RubyRequires
-  module_function
-  
-  def build_requires( code, libs )
-    libs.reject { |lib| code =~ /require\s*(['"])#{lib}\1/ }.
-         map { |lib| "require \"#{lib}\"\n" }.join
-  end
-
-  def place_requires( code, new_reqs )
-    return code unless new_reqs =~ /\S/
-
-    code.dup.sub!(/(?:^[ \t]*require\s*(['"]).+?\1.*\n)+/, "\\&#{new_reqs}") ||
-    code.sub(/\A(?:\s*(?:#.*)?\n)*/, "\\&#{new_reqs}\n")
-  end
-
-  def add_requires( code, reqs )
-    new_reqs = build_requires(code, reqs)
-    code     = place_requires(code, new_reqs)
-    e_sn(code)
-  end
-end
diff --git a/bundles/ruby.tmbundle/Support/vendor/README b/bundles/ruby.tmbundle/Support/vendor/README
deleted file mode 100644
index 8f9654a7c..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/README
+++ /dev/null
@@ -1,3 +0,0 @@
-Please remember that anything in this directory has a license of its own.
-
-These projects need to be chosen carefully, after ensuring that there license allows them to be bundled with TextMate, and all changes must comply with the project license.
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/CHANGES b/bundles/ruby.tmbundle/Support/vendor/rcodetools/CHANGES
deleted file mode 100644
index 0b102fece..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/CHANGES
+++ /dev/null
@@ -1,70 +0,0 @@
-rcodetools history
-==================
-User-visible changes since 0.8.5
---------------------------------
-* Fix DATA and __END__ handling in xmpfilter --tempfile (windows)
-
-User-visible changes since 0.8.4
---------------------------------
-* OOPS, added missing files.
-
-User-visible changes since 0.8.0
---------------------------------
-* xmpfilter: fixed multi-line annotation bugs
-
-User-visible changes since 0.7.0
---------------------------------
-* Support Ruby 1.9!
-* xmpfilter: multi-line annotation
-* xmpfilter --expectations generates expectations by Jay Fields
-* anything-rcodetools.el: new elisp
-* --tmpfile, --tempfile: use temporary file instead of open3 on un*x
-* rcodetools.el: smarter xmpfilter-command
-* rcodetools.el: rct-fork interface
-* rct-fork: require 'rubygems' initially
-* rct-fork: more stable
-
-User-visible changes since 0.5.0
---------------------------------
-* "test-driven completion" (TDC) support for Emacs and vim (see README.TDC)
-* --test (-t), --filename options for rct-complete and rct-doc, allowing to
-  specify the test to be run for 100% accurate completion/documentation in the
-  corresponding implementation
-* ruby-toggle-file: finds the test file corresponding to a given
-  implementation and vice versa
-* rct-fork, rct-fork-client: allow to eliminate the overhead due to library
-  loading (esp. useful for Rails)
-* rbtest: executes unit tests in a single Ruby script
-* --fork, --rbtest, --detect-rbtest supported by several commands
-* xmpfilter's --spec now autodetects the RSpec version and generates
-  specifications with the appropriate syntax
-
-User-visible changes since 0.4.1
---------------------------------
-* --dev: adds project directories to $:
-* --completion-class-info: list completion candidates and class info
-* display completion candidates with description, both in emacs
-  and vim (using the menu+preview window).
-
-User-visible changes since 0.4.0
---------------------------------
-* rct-meth-args: implemented -I
-* many bug fixes
-
-xmpfilter was integrated into rcodetools as of 0.4.0.
-
-xmpfilter history
-=================
-User-visible changes since 0.3.1 (2006-10-17)
-* implemented --debug
-* --[no]-warnings
-* --cd working_dir
-* --rails
-* --no-poetry
-* more intelligent assertions: try to find which local variables hold the
-  values compared against in assertions/expectations
-* editor-independent completion (-C, --completion-emacs, --completion-vim)
-* quick method/class reference with -D (--refe, --ri*)
-
-User-visible changes since 0.3.0 (2006-10-16)
-* xmpfilter.rb --spec works on win32 too
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/README b/bundles/ruby.tmbundle/Support/vendor/rcodetools/README
deleted file mode 100644
index 036373fc4..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/README
+++ /dev/null
@@ -1,98 +0,0 @@
-
- rcodetools  http://eigenclass.org/hiki.rb?rcodetools
- Copyright (c) 2005-2007 Mauricio Fernandez <mfp@acm.org> http://eigenclass.org
- Copyright (c) 2006-2008 rubikitch <rubikitch@ruby-lang.org> http://www.rubyist.net/~rubikitch/
-Use and distribution subject to the terms of the Ruby license.
-
-= Overview
-rcodetools is a collection of Ruby code manipulation tools. 
-It includes xmpfilter and editor-independent Ruby development helper tools,
-as well as emacs and vim interfaces.
-
-Currently, rcodetools comprises:
-* xmpfilter: Automagic Test::Unit assertions/RSpec expectations and code annotations
-* rct-complete: Accurate method/class/constant etc. completions
-* rct-doc: Document browsing and code navigator
-* rct-meth-args: Precise method info (meta-prog. aware) and TAGS generation
-* rct-fork: Pre-load heavy library(Rails etc) and speed up rct-complete/rct-doc (server)
-* rct-fork-client: Run Ruby programs from state the rct-fork server has
-* ruby-toggle-file: Toggle implementation file and test file
-* rbtest: Embedded Test::Unit for small scripts
-
-See also README.xmpfilter.
-
-Originally rct-complete and rct-doc were subcommands of xmpfilter.
-Actually they use xmpfilter's code heavily.
-But the relationship between xmpfilter (annotation) and completion/doc is not
-intuitive, so I (rubikitch) split it into separate executables.
-
-= Usage
-xmpfilter, rct-complete and rct-doc take its input from stdin and write to
-stdout. They can run in several modes; see 
- xmpfilter -h 
- rct-complete -h 
- rct-doc -h 
- rct-meth-args -h
- rct-fork -h
- rct-fork-client -h
- ruby-toggle-file -h
- rbtest -h
-README.emacs and README.vim describe how to use rcodetools from your editor.
-
-= Accurate Completion Internal and Caveat
-rct-complete and rct-doc use xmpfilter engine, ie they get runtime information by executing code.
-In Ruby (dynamic languages), type of any expressions except literals cannot be known without actually executing code.
-Moreover Ruby has open classes and singleton methods.
-Rcodetools asks `ruby' run-time informations, so we can get very accurate informations.
-Completion and document browsing are essentially identical operations,
-they both need the object value in question.
-Therefore we discuss completion.
-
-rct-complete does:
-(1) replaces target line with completion magic
-    (it calculates methods the target object has).
-(2) executes modified script.
-(3) once the control reaches completion magic, modified script exits.
-(4) outputs in specified format. (list candidates, EmacsLisp...)
-
-But this methodology has two big drawbacks, side-effects and inability to get any informations of uncovered code!
-
-An extreme side-effect example:
-  File.unlink a_file
-  File. <-
-
-If you call rct-complete, it removes a_file (sends a mail, accesses DB ...).
-So you must be careful to use, especially at TOPLEVEL.
-I (rubikitch) often experiment at TOPLEVEL with rcodetools, I NEVER use irb(sh) since rcodetools!
-
-An uncovered code example:
-  def foo
-    1. <-
-  end
-
-If the code does not call foo, we cannot do any completions.
-
-Useless eh? But we already have a way to elude the drawbacks, test scripts (unit tests)!
-Test scripts are self-enclosed and expected to be executed, so side-effects are not problem.
-Moreover tests call methods we write.
-Because Ruby's Test::Unit has an ability to test only one test method, we can do lightning-fast completion.
-Let's call it Test-Driven Completion (TDC).
-
-To support TDC, rct-complete has -t option.
-With -t, it concatenate modified script and test/unit code.
-If the control does not reach target line, test/unit code calls the line.
-
-How do we select test script and test method?
-The editor selects recently selected buffer of test script as test script of TDC,
-because the test-infected tend to go and return between test script and implementation script.
-It considers files matching /test.*\.rb/ as test script.
-It selects test method at the cursor position.
-
-TDC adds roles of test scripts.
-Enjoy TDC magic!
-
-See also README.TDC.
-
-
-= License
-rcodetools is licensed under the same terms as Ruby.
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/README.TDC b/bundles/ruby.tmbundle/Support/vendor/rcodetools/README.TDC
deleted file mode 100644
index 5a413dab0..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/README.TDC
+++ /dev/null
@@ -1,158 +0,0 @@
-
-= Overview
-
-Ruby is very dynamic language, therefore it is impossible to do
-accurate completion without executing script.  While executing script
-from start to cursor point is often dangerous, executing unit test
-script covering current point is SAFE.  I call this methodology
-`Test-Driven Completion' (TDC).
-
-As I have already stated in README, browsing documentation of method
-(rct-doc) is almost identical operation to completion.  This
-discussion is applicable to rct-doc.
-
-= Why TDD Is Needed
-
-In the following code snippet:
-
-  File.unlink a_file
-  File. <-
-
-If you complete after `File.', rct-complete actually deletes a_file.
-Normally it is unpleasant.
-In real-life development, side-effect is inevitable.
-
-In the foo method which are not called:
-
-  def foo
-    1. <-
-  end
-
-If the code does not call foo, rct-complete cannot do any completions.
-Before TDC, if you want to do completion in methods, you have to write
-method call and remove it after completion. Too useless!!
-
-= Messianic Unit Test Script
-
-Recently Test-Driven Development (TDD) is widespread.  Many developers
-write unit tests.  Fortunately Ruby's unit tester, Test::Unit, is
-sophisticated enough to test one test method.  Unit tests are
-self-enclosed: they must tear down resources, so executing unit tests
-are SAFE.  TDC uses unit test to do completion.
-
-= TDC Methodology
-
-(1) Switch to unit test script.
-(2) Write a test for target method.
-(3) Switch to implementation script.
-(4) You can write target method WITH COMPLETION!
-(5) Back to (1)
-
-TDC methodology is almost identical to TDD. TDC is very easy for TDDers.
-
-= TDC With Example
-
-For simplicity, suppose that you are unfamiliar with Time class and
-you want to write a method to format date string.
-
-The directory structure and file contents is following:
-
-  /tmp/mylib0/
-  /tmp/mylib0/lib/
-     mylib0.rb
-  /tmp/mylib0/test/
-     test_mylib0.rb
-
-  List: mylib0.rb
-  # contrived example of long-runtime method
-  def mysleep(x)
-    sleep x
-  end
-
-  def mytime(tm)
-
-  end
-
-
-  List: test_mylib0.rb
-  require 'test/unit'
-  require 'mylib0'
-  class TestMylib0 < Test::Unit::TestCase
-    def test_0_mysleep
-      s = Time.now
-      mysleep 3.0
-      e = Time.now
-      assert_in_delta 3.0, e-s, 0.01
-    end
-
-    def test_1_mytime
-
-    end
-  end
-
-These sample files are in demo/ directory.
-
-
-== Switch to unit test script.
-
-TDC starts with writing unit test as TDD does.
-Open test_mylib0.rb.
-
-== Write a test for target method.
-
-Suppose that you want to write mytime method and test_1_mytime test
-method, and that you want to experiment Time class first (before
-forming an assertion).
-
-In TDC, you do not have to write an assertion first: just write only a
-method call.  If you are familiar with Time class, you are free to
-write an assertion, of course.
-
-    def test_1_mytime
-      mytime(Time.now)
-    end
-
-At this time, the cursor position is in test_1_mytime test method.
-
-== Switch to implementation script.
-
-Open mylib0.rb with the `ruby-toggle-file' script.  For example, in Emacs use
-the `ruby-toggle-buffer' command, and in vim the <localleader>t (by default
-\t) binding.  Since in TDD/TDC you often switch between the test and the
-implementation, it is much handier than typing the filename manually.
-
-The rct-complete uses latest-selected test script as TDC test script
-and test method at cursor position as TDC test method.  In this case,
-test_mylib0.rb is TDC test script and test_1_mytime is TDC test
-method.  If the cursor position of test_mylib0.rb is at the top,
-rct-complete executes whole test methods in test_mylib0.rb.  Therefore
-latency of completion is longer.
-
-== You can write target method WITH COMPLETION!
-
-Fill mytime method.
-
-  def mytime(tm)
-    tm.
-  end
-
-Do completion after `tm.'. Here! Your editor is listing methods `tm'
-accepts!!  If your editor has help-on-candidate mechanism (eg. Emacs +
-Icicles), you would see documentation of each listed method.
-
-Then you find `Time#strftime' method. Type `str' and do completion.
-
-  def mytime(tm)
-    tm.strftime 
-  end
-
-Usage is... use `rct-doc' (in Emacs, `rct-ri') after `strftime'.
-
-After you are familiar with Time class, switch to test script and write assertions.
-
-= When Modifying Another Method
-
-If you want to modify already-written method, setting cursor position
-of corresponding test script to corresponding test method is better.
-It tells rct-complete new test script and test method, so you can do
-completion in the new method.
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/README.emacs b/bundles/ruby.tmbundle/Support/vendor/rcodetools/README.emacs
deleted file mode 100644
index c3acff5d3..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/README.emacs
+++ /dev/null
@@ -1,75 +0,0 @@
-
-rcodetools.el allows you to run rcodetools on a buffer.
-
-To eval the sexp, type C-e C-x C-e; `end-of-line' and `eval-last-sexp'.
-
-installation
-============
-
-If you use RI document feature, you must install ri-emacs first.
-  http://rubyforge.org/projects/ri-emacs/
-
-If you feel RI and ri-emacs.rb startup is SLOW, you want to install FastRI.
-FastRI offers ri-emacs compatible layer, so you can use it with ri-ruby.el.
-  http://eigenclass.org/hiki.rb?fastri
-
-Copy <tt>rcodetools.el</tt> to the appropriate directory, which is in load-path.
-Then require it.
-  (require 'rcodetools)
-
-If you use icicles copy <tt>icicles-rcodetools.el</tt> too.
-Then require it.
-  (require 'icicles-rcodetools)
-It provides wonderful `help on candidate' feature, RI document on each candidate during completion.
-
-If you use anything.el copy <tt>anything-rcodetools.el</tt> too.
-Then require it.
-  (require 'anything-rcodetools)
-RI document on each candidate during completion.
-
-anything-show-completion.el shows selection (mehod) in buffer for completion.
-It is available in:
-  http://www.emacswiki.org/cgi-bin/wiki/download/anything-show-completion.el
-
-I think anything-rcodetools is more convenient than icicles-rcodetools.
-I'm addicted to anything!
-  http://www.emacswiki.org/cgi-bin/wiki/Anything
-
-xmpfilter on buffer
-===================
-
-# [EVAL IT] (describe-function 'xmp)
-
-If you want to add => marks, call comment-dwim twice.
-
-# [EVAL IT] (describe-function 'comment-dwim)
-
-method/class/constant completion
-================================
-
-# [EVAL IT] (describe-function 'rct-complete-symbol)
-
-If you use icicles-rcodetools or anything-rcodetools, you can browse RI document
-for selected candidate by typing C-M-RET (icicles) or C-z (anything.
-It is wonderful icicles and anything feature!!
-
-show RI document / jump to the definition
-=========================================
-
-# [EVAL IT] (describe-function 'rct-ri)
-
-By default rct-ri asks for a TAGS file, which is generated by tag generator like rtags.
-If there is a TAGS file, this command jumps to the definition of current method.
-If use do not use this feature, evaluate:
-  (setq rct-find-tag-if-available nil)
-
-# [EVAL IT] (describe-variable 'rct-find-tag-if-available)
-
-speed-up xmpfilter and completion
-=================================
-
-# [EVAL IT] (describe-function 'rct-fork)
-# [EVAL IT] (describe-function 'rct-fork-kill)
-
-M-x rct-fork pre-loads heavy libraries (like rails).
-You need not every time wait for loading them anymore!
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/README.ja b/bundles/ruby.tmbundle/Support/vendor/rcodetools/README.ja
deleted file mode 100644
index 7a321169f..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/README.ja
+++ /dev/null
@@ -1,84 +0,0 @@
-
- rcodetools  http://eigenclass.org/hiki.rb?rcodetools
- Copyright (c) 2005-2007 Mauricio Fernandez <mfp@acm.org> http://eigenclass.org
- Copyright (c) 2006-2008 rubikitch <rubikitch@ruby-lang.org> http://www.rubyist.net/~rubikitch/
-Use and distribution subject to the terms of the Ruby license.
-
-= ����
-rcodetools �� Ruby �Υ����ɤ򰷤��ġ��뷲�Ǥ���
-rcodetools �ˤ� xmpfilter �ȥ��ǥ����˰�¸���ʤ���ȯ�ٱ�ġ��뤬�ޤޤ�Ƥ��ޤ���
-Emacs �� Vim �Υ��󥿡��ե��������Ѱդ��Ƥ��ޤ���
-
-* xmpfilter: Test::Unit assert* / RSpec should* ��ư����������������
-* rct-complete: �����٥᥽�å�̾�����饹̾�����̾���䴰
-* rct-doc: �ɥ�����Ȼ��ȡ������ɥʥӥ�������
-* rct-meth-args: �����٥᥽�åɾ���ꥹ�ȡ�TAGS �ե��������
-* rct-fork: Rails ���Ť��饤�֥���ͽ������ɤ����䴰���®������ʥ����С�
-* rct-fork-client: rct-fork �����Ф��ݻ�������֤��� Ruby ������ץȤ�¹Ԥ���
-* ruby-toggle-file: �ƥ��ȥ�����ץȤȼ���������ץȤ��ڤ괹����
-* rbtest: �����ϥ�����ץȤΤ���������� Test::Unit
-
-
-= �Ȥ���
-
-== ����������
-�����ͤ�ɽ���������Ԥ� # => ��ä��ޤ���
-
- a, b = "foo", "baz"
- a + b                                             # =>
- a.size                                            # =>
-
-xmpfilter ���̤��Ȳ��Τ褦�˼����ͤ�ɽ�����Ƥ���ޤ���
-
- a, b = "foo", "baz"
- a + b                                             # => "foobaz"
- a.size                                            # => 3
-
-
-== Test::Unit assert ʸ����
-
-���ǤˤǤ������äƤ���ץ������Υƥ��ȥ�����ץȤ�񤯤Τ����ݤǤ��͡�
-
-  def test_insertion
-    @o.insert "bar"
-    @o.insert "baz"
-    @o.size                                        # =>
-    @o.last                                        # =>
-    @o.first                                       # =>
-    @o.complex_computation                         # =>
-    @o.last(2)                                     # =>
-  end
-
-xmpfilter��-u ���ץ����ˤ���֤�ڸ����Ƥ���ޤ���
-
-  def test_insertion
-    @o.insert "bar"
-    @o.insert "baz"
-    assert_equal(2, @o.size)
-    assert_equal("baz", @o.last)
-    assert_equal("bar", @o.first)
-    assert_in_delta(3.14159265358979, @o.complex_computation, 0.0001)
-    assert_equal(["baz", "bar"], @o.last(2))
-  end
-
-RSpec �ˤĤ��Ƥ�Ʊ�ͤΤ��Ȥ��Ǥ��ޤ�����-s ���ץ�����
-
-== �䴰���ɥ�����Ȼ���
-
-ư��ˤ�륹���꡼�󥷥�åȤ򸫤Ƥ���������
-
-http://eigenclass.org/hiki.rb?rcodetools-screenshots
-
-== �ܤ����Ȥ���
--h ���ץ�����Ĥ���Ȼ��Ѳ�ǽ�ʥ��ץ����ɽ������ޤ���
-
- xmpfilter -h 
- rct-complete -h 
- rct-doc -h 
- rct-meth-args -h
- rct-fork -h
- rct-fork-client -h
- ruby-toggle-file -h
- rbtest -h
-
-README.emacs �� README.vim �˥��ǥ�����ǤλȤ������ܤ����񤤤Ƥ���ޤ���
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/README.method_analysis b/bundles/ruby.tmbundle/Support/vendor/rcodetools/README.method_analysis
deleted file mode 100644
index 53a482d05..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/README.method_analysis
+++ /dev/null
@@ -1,13 +0,0 @@
-
-method_analyzer.rb can be used to gather precise information about the exact
-methods called in your code, allowing you to explore it better with rct-doc
-(see README.emacs and README.vim for more information). This requires high
-code coverage, since it can only record such data when the code is executed.
-
-rct-meth-args can be used to generate fairly complete TAGS files. It operates
-by loading the specified files and tracking method definitions; therefore, it
-is meta-programming aware, unlike other implementations.
-
-You can use them conveniently by adding the code shown in
-Rakefile.method_analysis to your Rakefile.
-
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/README.vim b/bundles/ruby.tmbundle/Support/vendor/rcodetools/README.vim
deleted file mode 100644
index ea7c7c59f..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/README.vim
+++ /dev/null
@@ -1,111 +0,0 @@
-
-Copy rcodetools.vim to your plugin directory (typically $HOME/.vim/plugin) in
-order to enable accurate code completion, quick RI execution and exact tag
-jumping.
-
-Switching between implementation and test files
-===============================================
-The <localleader>t binding (by default \t) will call ruby-toggle-file to
-switch from test to implementation and vice versa. Moreover, when you switch
-from the test to the implementation, rcodetools will remember which test
-you were editing (based on the cursor position), and call it as needed for
-advanced code completion or precise RI documentation, as documented below.
-
-The actual binding can be changed in your .vimrc as follows:
- let g:RCT_toggle_binding="<C-X><C-t>"  " use ^X^T to go test <=> implementation
-
-Code completion
-===============
-rcodetools.vim redefines user-defined completion for Ruby programs, so you can
-use the intelligent, 100%-accurate completion with <C-X><C-U> in insert mode.
-Note that this runs the code to obtain the exact candidate list.
-
-If you've set completeopt to menu,preview then rcodetools.vim can display
-information about the completion candidates. The menu will show the synopsis 
-as given in the RI documentation, and the preview window will contain the full
-RI documentation.
-
-This functionality relies on fri for quick lookups. It can be enabled by setting
-
-  let g:rct_completion_use_fri = 1  " 0 by default (disabled)
-
-in your .vimrc (don't forget to run fastri-server too). 
-Obtaining the documentation for many candidates can be slow, so you can set
-the threshold above which additional documentation will not be shown with
-
- " 20 by default, about a couple secs max wait on a normal machine
-  let g:rct_completion_info_max_len = 20 
-
-Quick RI documentation and exact tag jumping
-============================================
-When you're editing a Ruby file, <C-]> will jump to the definition of the
-chosen element if found in the TAGS file; otherwise, it will call RI and show
-the documentation in a new window.
-You can specify the RI executable to use by adding something like
-    let g:RCT_ri_cmd = "ri -T -f plain "
-to your .vimrc. (rcodetools.vim also honors b:RCT_RI_cmd and w:RCT_RI_cmd if set).
-By default, "fri -f plain " will be used. fri (FastRI) is an improved RI
-documentation browser, which features more intelligent search modes, gem
-integration, vastly better performance... You can find it at
-http://eigenclass.org/hiki.rb?fastri  and it's also available in gem format
-gem install fastri
-
-If you want to call RI for the word the cursor is on (instead of jumping to
-the definition if found), you can use this binding:
- <LocalLeader>r   (\r by default if you haven't changed your localleader)
-You can specify another binding in your .vimrc as follows:
- let g:RCT_ri_binding="<C-X><C-R>" " use ^X^R to call vim on current word
-
-Using xmpfilter
-===============
-xmpfilter takes code from stdin and outputs to stdout so you can filter
-your code with ! as usual. 
-
-If you use xmpfilter often, you might want to use mappings like the
-following, which allow you to:
-* add annotations
-* expand assertions
-* insert/remove # => markers
-
-
-
-" plain annotations
-map <silent> <F10> !xmpfilter -a<cr>
-nmap <silent> <F10> V<F10>
-imap <silent> <F10> <ESC><F10>a
-
-" Test::Unit assertions; use -s to generate RSpec expectations instead
-map <silent> <S-F10> !xmpfilter -u<cr>
-nmap <silent> <S-F10> V<S-F10>
-imap <silent> <S-F10> <ESC><S-F10>a
-
-" Annotate the full buffer
-" I actually prefer ggVG to %; it's a sort of poor man's visual bell 
-nmap <silent> <F11> mzggVG!xmpfilter -a<cr>'z
-imap <silent> <F11> <ESC><F11>
-
-" assertions
-nmap <silent> <S-F11> mzggVG!xmpfilter -u<cr>'z
-imap <silent> <S-F11> <ESC><S-F11>a
-
-" Add # => markers
-vmap <silent> <F12> !xmpfilter -m<cr>
-nmap <silent> <F12> V<F12>
-imap <silent> <F12> <ESC><F12>a
-
-" Remove # => markers
-vmap <silent> <S-F12> ms:call RemoveRubyEval()<CR>
-nmap <silent> <S-F12> V<S-F12>
-imap <silent> <S-F12> <ESC><S-F12>a
-
-
-function! RemoveRubyEval() range
-  let begv = a:firstline
-  let endv = a:lastline
-  normal Hmt
-  set lz
-  execute ":" . begv . "," . endv . 's/\s*# \(=>\|!!\).*$//e'
-  normal 'tzt`s
-  set nolz
-  redraw
-endfunction
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/README.xmpfilter b/bundles/ruby.tmbundle/Support/vendor/rcodetools/README.xmpfilter
deleted file mode 100644
index 1ea49dcb9..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/README.xmpfilter
+++ /dev/null
@@ -1,287 +0,0 @@
-
-xmpfilter  http://eigenclass.org/hiki.rb?xmpfilter
-Copyright (c) 2005-2008 Mauricio Fernandez <mfp@acm.org> http://eigenclass.org
-                        rubikitch <rubikitch@ruby-lang.org>
-Use and distribution subject to the terms of the Ruby license.
-
-Overview
-========
-xmpfilter is a small tool that can be used to
-* generate Test::Unit assertions, RSpec expectations and
-  expectations blocks semi-automatically
-* annotate source code with intermediate results (a bit like irb
-  --simple-prompt but only for the lines explicitly marked with # =>)
-  Very useful for example code (such as postings to ruby-talk).
-
-Usage
-=====
-xmpfilter takes its input from stdin and writes to stdout. It can run in
-several modes (annotation, Test::Unit assertion expansion, RSpec expectation
-generation, expectations expectations generation, marker insertion); see 
- xmpfilter -h 
-README.emacs and README.vim describe how to use xmpfilter from your editor.
-
-Example: code annotation
-========================
-Just add "# =>" markers to the lines whose values you want to be shown:
-
- a, b = "foo", "baz"
- a + b                                             # =>
- a.size                                            # =>
-
-will be expanded to (in one keypress in a decent editor, see README.emacs and
-README.vim)
-
- a, b = "foo", "baz"
- a + b                                             # => "foobaz"
- a.size                                            # => 3
-
-This saves much cut&pasting when you're posting to ruby-list/ruby-talk/ruby-core
-(We use it all the time).
-
-
-Example: multi-line code annotation
-===================================
-Just add "# =>" markers to the next lines whose values you want to be shown with pp:
-
-a = ["1111111111111111111111111111111111111111111111111111", 123334324234242342,
-  1332333333,6,8 ]
-1                               # => 
-a
-# => 
-
-will be expanded to (in one keypress in a decent editor, see README.emacs and
-README.vim)
-
-a = ["1111111111111111111111111111111111111111111111111111", 123334324234242342,
-  1332333333,6,8 ]
-1                               # => 1
-a
-# => ["1111111111111111111111111111111111111111111111111111",
-#     123334324234242342,
-#     1332333333,
-#     6,
-#     8]
-
-
-Example: assertion generation
-=============================
-
-xmpfilter can generate assertions based on the current behavior of the code
-to be tested (iow. the current behavior is assumed to be correct and is used
-to generate assertions which won't be modified by further runs of
-xmpfilter), making it quite useful for regression testing.
-
-Imagine you have a ComplexClass you want to test. You might start with
-
-    class TestComplexClass < Test::Unit::TestCase
-      def setup; @o = ComplexClass.new("foo", false) end
-    end
-
-and then want to add some tests:
-
-  def test_insertion
-    @o.insert "bar"
-    @o.insert "baz"
-    # ... assertions here
-  end
-
-At this point, you want to add several assertions to verify that the values
-returned by @o.size, @o.last, @o.first, @o.complex_computation and @o.last(2)
-are correct. You can just write the following and feed the file to
-xmpfilter in -u mode (the # => markers can also be inserted by
-xmpfilter, see README.vim for more information:
-
-  def test_insertion
-    @o.insert "bar"
-    @o.insert "baz"
-    @o.size                                        # =>
-    @o.last                                        # =>
-    @o.first                                       # =>
-    @o.complex_computation                         # =>
-    @o.last(2)                                     # =>
-  end
-
-xmpfilter will run the test and remember what happened in each marked line,
-and then rewrite the code so that it looks for instance like
-
-  def test_insertion
-    @o.insert "bar"
-    @o.insert "baz"
-    assert_equal(2, @o.size)
-    assert_equal("baz", @o.last)
-    assert_equal("bar", @o.first)
-    assert_in_delta(3.14159265358979, @o.complex_computation, 0.0001)
-    assert_equal(["baz", "bar"], @o.last(2))
-  end
-
-As you can see, it can save some typing.
-
-You can edit the generated assertions as you want: xmpfilter will not
-modify lines without the "# =>" marker. xmpfilter can be used repeatedly as
-you add more assertions. Imagine you want to verify that @o.last(3) raises an
-ArgumentError. You can simply add one line marked with # => :
-  
-  ...
-    assert_in_delta(3.14159265358979, @o.complex_computation, 0.0001)
-    assert_equal(["baz", "bar"], @o.last(2))
-    @o.last(3)                                     # =>
-  end
-
-and have it expanded by xmpfilter:
-
-  ...
-    assert_in_delta(3.14159265358979, @o.complex_computation, 0.0001)
-    assert_equal(["baz", "bar"], @o.last(2))
-    assert_raise(ArgumentError){ @o.last(3) } 
-  end
-
-
-Example: RSpec expectations
-===========================
-Here's some code before and after filtering it with xmpfilter:
-
-  class X
-    Y = Struct.new(:a)
-    def foo(b); b ? Y.new(2) : 2 end
-    def bar; raise "No good" end
-    def baz; nil end
-    def fubar(x); x ** 2.0 + 1 end
-    def babar; [1,2] end
-    A = 1
-    A = 1
-  end
-
-  context "Testing xmpfilter's expectation expansion" do
-    setup do
-      @o = X.new
-    end
-
-    specify "Should expand should_equal expectations" do
-      @o.foo(true)   # =>
-      @o.foo(true).a # =>
-      @o.foo(false)  # =>
-    end
-
-    specify "Should expand should_raise expectations" do
-      @o.bar         # =>
-    end
-
-    specify "Should expand should_be_nil expectations" do
-      @o.baz         # =>
-    end
-
-    specify "Should expand correct expectations for complex values" do
-      @o.babar       # =>
-    end
-
-    specify "Should expand should_be_close expectations" do
-      @o.fubar(10)   # =>
-    end
-  end
-
-
-after piping it to xmpfilter -s:
-
-  class X
-    Y = Struct.new(:a)
-    def foo(b); b ? Y.new(2) : 2 end
-    def bar; raise "No good" end
-    def baz; nil end
-    def fubar(x); x ** 2.0 + 1 end
-    def babar; [1,2] end
-    A = 1
-    A = 1 # !> already initialized constant A
-  end
-
-  context "Testing xmpfilter's expectation expansion" do
-    setup do
-      @o = X.new
-    end
-
-    specify "Should expand should_equal expectations" do
-      (@o.foo(true)).should_be_a_kind_of X::Y
-      (@o.foo(true).inspect).should_equal "#<struct X::Y a=2>"
-      (@o.foo(true).a).should_equal 2
-      (@o.foo(false)).should_equal 2
-    end
-
-    specify "Should expand should_raise expectations" do
-      lambda{(@o.bar)}.should_raise RuntimeError
-    end
-
-    specify "Should expand should_be_nil expectations" do
-      (@o.baz).should_be_nil
-    end
-
-    specify "Should expand correct expectations for complex values" do
-      (@o.babar).should_equal [1, 2]
-    end
-
-    specify "Should expand should_be_close expectations" do
-      (@o.fubar(10)).should_be_close(101.0, 0.0001)
-    end
-  end
-
-
-Example: expectations expectations
-==================================
-Expectations is a light-weight unit testing framework by Jay Fields.
-(http://expectations.rubyforge.org)
-
-Here's some code before and after filtering it with xmpfilter:
-
-  require 'rubygems'
-  require 'expectations'
-
-  S = Struct.new :a
-  Expectations do
-    1 + 1  # =>
-    "a".length # =>
-    [][1] # =>
-    1.hoge # =>
-    1.1 + 1.0 # =>
-    S.new(1) # =>
-  end
-
-after piping it to xmpfilter --expectations:
-
-  require 'rubygems'
-  require 'expectations'
-
-  S = Struct.new :a
-  Expectations do
-    expect 2 do
-      1 + 1
-    end
-
-    expect 1 do
-      "a".length
-    end
-
-    expect nil do
-      [][1]
-    end
-
-    expect NoMethodError do
-      1.hoge
-    end
-
-    expect 2.0999..2.1001 do
-      1.1 + 1.0
-    end
-
-    expect S do
-      S.new(1)
-    end
-
-    expect "#<struct S a=1>" do
-      S.new(1).inspect
-    end
-
-  end
-
-
-License
-=======
-xmpfilter is licensed under the same terms as Ruby.
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/Rakefile b/bundles/ruby.tmbundle/Support/vendor/rcodetools/Rakefile
deleted file mode 100644
index 7d2c227f8..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/Rakefile
+++ /dev/null
@@ -1,121 +0,0 @@
-
-PKG_REVISION = ".0"
-
-$:.unshift "lib" if File.directory? "lib"
-require 'rcodetools/xmpfilter'
-require 'rake/testtask'
-include Rcodetools
-RCT_VERSION  = XMPFilter::VERSION
-
-desc "Run the unit tests in pure-Ruby mode ."
-Rake::TestTask.new(:test) do |t|
-  t.test_files = FileList['test/test*.rb']
-  t.verbose = true
-end
-
-begin
-  require 'rcov/rcovtask'
-  desc "Run rcov."
-  Rcov::RcovTask.new do |t|
-    t.rcov_opts << "--xrefs"  # comment to disable cross-references
-    t.test_files = FileList['test/test_*.rb'].to_a - ["test/test_functional.rb"]
-    t.verbose = true
-  end
-
-  desc "Save current coverage state for later comparisons."
-  Rcov::RcovTask.new(:rcovsave) do |t|
-    t.rcov_opts << "--save"
-    t.test_files = FileList['test/test_*.rb'].to_a - ["test/test_functional.rb"]
-    t.verbose = true
-  end
-rescue LoadError
-  # rcov is not installed
-end
-task :default => :test
-
-
-#{{{ Package tasks
-PKG_FILES = FileList[
-  "bin/xmpfilter", "bin/rct-*", "bin/ruby-toggle-file", "bin/rbtest",
-"lib/**/*.rb",
-"CHANGES", "rcodetools.*", "icicles-rcodetools.el", "anything-rcodetools.el",
-"README", "README.*", "THANKS", 
-"Rakefile", "Rakefile.method_analysis",
-"setup.rb",
-"test/**/*.rb","test/**/*.taf"
-]
-
-begin
-  require 'rake/gempackagetask'
-  Spec = Gem::Specification.new do |s|
-    s.name = "rcodetools"
-    s.version = RCT_VERSION + PKG_REVISION
-    s.summary = "rcodetools is a collection of Ruby code manipulation tools"
-    s.description = <<EOF
-rcodetools is a collection of Ruby code manipulation tools. 
-It includes xmpfilter and editor-independent Ruby development helper tools,
-as well as emacs and vim interfaces.
-
-Currently, rcodetools comprises:
-* xmpfilter: Automagic Test::Unit assertions/RSpec expectations and code annotations
-* rct-complete: Accurate method/class/constant etc. completions
-* rct-doc: Document browsing and code navigator
-* rct-meth-args: Precise method info (meta-prog. aware) and TAGS generation
-EOF
-    s.files = PKG_FILES.to_a
-    s.require_path = 'lib'
-    s.author = "rubikitch and Mauricio Fernandez"
-    s.email = %{"rubikitch" <rubikitch@ruby-lang.org>, "Mauricio Fernandez" <mfp@acm.org>}
-    s.homepage = "http://eigenclass.org/hiki.rb?rcodetools"
-    s.bindir = "bin"
-    s.executables = %w[rct-complete rct-doc xmpfilter rct-meth-args]
-    s.has_rdoc = true
-    s.extra_rdoc_files = %w[README]
-    s.rdoc_options << "--main" << "README" << "--title" << 'rcodetools'
-    s.test_files = Dir["test/test_*.rb"]
-    s.post_install_message = <<EOF
-
-==============================================================================
-
-rcodetools will work better if you use it along with FastRI, an alternative to
-the standard 'ri' documentation browser which features intelligent searching,
-better RubyGems integration, vastly improved performance, remote queries via
-DRb... You can find it at http://eigenclass.org/hiki.rb?fastri and it is also
-available in RubyGems format:
-
-    gem install fastri
-
-Read README.emacs and README.vim for information on how to integrate
-rcodetools in your editor.
-
-==============================================================================
-
-EOF
-
-  end
-
-  task :gem => [:test]
-  Rake::GemPackageTask.new(Spec) do |p|
-    p.need_tar_gz = true
-  end
-
-rescue LoadError
-  # RubyGems not installed
-end
-
-desc "install by setup.rb"
-task :install do
-  sh "sudo ruby setup.rb install"
-end
-
-desc "release in rubyforge (package is created)"
-task :release_only  do 
-  sh "rubyforge login"
-  sh "rubyforge add_release rcodetools rcodetools #{RCT_VERSION} pkg/rcodetools-#{RCT_VERSION}.0.tar.gz "
-  sh "rubyforge add_file rcodetools rcodetools #{RCT_VERSION} pkg/rcodetools-#{RCT_VERSION}.0.gem "
-end
-
-desc "release in rubyforge"
-task :release => [:package, :release_only]
-
-# vim: set sw=2 ft=ruby:
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/Rakefile.method_analysis b/bundles/ruby.tmbundle/Support/vendor/rcodetools/Rakefile.method_analysis
deleted file mode 100644
index 1dc8e0414..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/Rakefile.method_analysis
+++ /dev/null
@@ -1,30 +0,0 @@
-
-# Rake tasks to generate TAGS and gather method analysis information.
-# See README.method_analysis for more information.
-
-## my standard Rakefile
-task :tags => "TAGS"
-
-desc "Generate method_analysis by ruby -rmethod_analyzer."
-task :analyze => [:_prepare_method_analyze, :tags] do
-  at_exit { sh "ls -l method_analysis" }
-end
-
-task :_prepare_method_analyze do
-  ENV['METHOD_ANALYZER_FORMAT']="marshal"
-  sh "rm -f method_analysis"
-  puts "generating method_analysis"
-end
-
-## application-specific Rakefile (RTtool)
-task :analyze do
-  sh "ruby -Ilib -rmethod_analyzer test/test.rb"
-  sh "ruby -Ilib -rmethod_analyzer test/test-rt2html-lib.rb"
-  sh "ruby -Ilib -rmethod_analyzer test/test-rtparser.rb"
-end
-
-file "TAGS" => FileList["lib/rt/*.rb"] do
-  sh "rct-meth-args -t lib/rt/*.rb > TAGS"
-end
-
-
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/THANKS b/bundles/ruby.tmbundle/Support/vendor/rcodetools/THANKS
deleted file mode 100644
index 0ed1e3763..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/THANKS
+++ /dev/null
@@ -1,11 +0,0 @@
-Some names forgotten, tell me if you care :) -- mfp
-
-rubikitch
-* expanded xmp3.rb (a previous version of xmpfilter.rb) to support RSpec expectations
-* wrote the elisp magic to use xmpfilter.rb with emacs
-* made the 100% accurate, editor-independent completion system
-[rubikitch took xmpfilter and turned it into the much more powerful
-rcodetools, so there are way too many things to list them here :)]
-
-Adagios
-* found & fixed problem with rcodetools.vim plugin on win32
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/anything-rcodetools.el b/bundles/ruby.tmbundle/Support/vendor/rcodetools/anything-rcodetools.el
deleted file mode 100644
index e21a743de..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/anything-rcodetools.el
+++ /dev/null
@@ -1,151 +0,0 @@
-;;; anything-rcodetools.el --- accurate Ruby method completion with anything
-;; $Id: anything-rcodetools.el,v 1.13 2009/04/20 16:25:37 rubikitch Exp $
-
-;;; Copyright (c) 2007 rubikitch
-
-;; Author: rubikitch <rubikitch@ruby-lang.org>
-;; URL: http://www.emacswiki.org/cgi-bin/wiki/download/anything-rcodetools.el
-
-;;; Use and distribution subject to the terms of the Ruby license.
-
-;;; Commentary:
-
-;; (0) You need rcodetools, anything.el and FastRI. Note that you do not have to
-;;     configure anything.el if you use anything.el for this package.
-;; (1) You need to add to .emacs:
-;;       (require 'anything)
-;;       (require 'anything-rcodetools)
-;;       ;; Command to get all RI entries.
-;;       (setq rct-get-all-methods-command "PAGER=cat fri -l")
-;;       ;; See docs
-;;       (define-key anything-map "\C-z" 'anything-execute-persistent-action)
-
-;;; Commands:
-;;
-;; Below are complete command list:
-;;
-;;
-;;; Customizable Options:
-;;
-;; Below are customizable option list:
-;;
-
-;;; History:
-
-;; $Log: anything-rcodetools.el,v $
-;; Revision 1.13  2009/04/20 16:25:37  rubikitch
-;; Set anything-samewindow to nil
-;;
-;; Revision 1.12  2009/04/18 10:12:02  rubikitch
-;; Adjust to change of `use-anything-show-completion'
-;;
-;; Revision 1.11  2009/04/17 20:21:47  rubikitch
-;; * require anything
-;; * require anything-show-completion.el if available
-;;
-;; Revision 1.10  2009/04/17 20:11:03  rubikitch
-;; removed old code
-;;
-;; Revision 1.9  2009/04/17 20:07:52  rubikitch
-;; * use --completion-emacs-anything option
-;; * New implementation of `anything-c-source-complete-ruby-all'
-;;
-;; Revision 1.8  2009/04/15 10:25:25  rubikitch
-;; Set `anything-execute-action-at-once-if-one' t
-;;
-;; Revision 1.7  2009/04/15 10:24:23  rubikitch
-;; regexp bug fix
-;;
-;; Revision 1.6  2008/01/14 17:59:34  rubikitch
-;; * uniform format (anything-c-source-complete-ruby, anything-c-source-complete-ruby-all)
-;; * rename command: anything-c-ri -> anything-rct-ri
-;;
-;; Revision 1.5  2008/01/13 17:54:04  rubikitch
-;; anything-current-buffer advice.
-;;
-;; Revision 1.4  2008/01/08 14:47:34  rubikitch
-;; Added (require 'rcodetools).
-;; Revised commentary.
-;;
-;; Revision 1.3  2008/01/04 09:32:29  rubikitch
-;; *** empty log message ***
-;;
-;; Revision 1.2  2008/01/04 09:21:23  rubikitch
-;; fixed typo
-;;
-;; Revision 1.1  2008/01/04 09:21:05  rubikitch
-;; Initial revision
-;;
-
-;;; Code:
-
-(require 'anything)
-(require 'rcodetools)
-(when (require 'anything-show-completion nil t)
-  (use-anything-show-completion 'rct-complete-symbol--anything
-                                '(length pattern)))
-
-(defun anything-rct-ri (meth)
-  (ri (get-text-property 0 'desc meth)))
-
-(defun anything-rct-complete  (meth)
-  (save-excursion
-    (set-buffer anything-current-buffer)
-    (search-backward pattern)
-    (delete-char (length pattern)))
-  (insert meth))
-
-(setq rct-complete-symbol-function 'rct-complete-symbol--anything)
-(defvar anything-c-source-complete-ruby
-  '((name . "Ruby Method Completion")
-    (candidates . rct-method-completion-table)
-    (init
-     . (lambda ()
-         (condition-case x
-             (rct-exec-and-eval rct-complete-command-name "--completion-emacs-anything")
-           ((error) (setq rct-method-completion-table nil)))))
-    (action
-     ("Completion" . anything-rct-complete)
-     ("RI" . anything-rct-ri))
-    (volatile)
-    (persistent-action . anything-rct-ri)))
-
-(defvar rct-get-all-methods-command "PAGER=cat fri -l")
-(defvar anything-c-source-complete-ruby-all
-  '((name . "Ruby Method Completion (ALL)")
-    (init
-     . (lambda ()
-         (unless (anything-candidate-buffer)
-           (with-current-buffer (anything-candidate-buffer 'global)
-             (call-process-shell-command rct-get-all-methods-command nil t)
-             (goto-char 1)
-             (while (re-search-forward "^.+[:#.]\\([^:#.]+\\)$" nil t)
-               (replace-match "\\1\t[\\&]"))))))
-    (candidates-in-buffer
-     . (lambda ()
-         (let ((anything-pattern (format "^%s.*%s" (regexp-quote pattern) anything-pattern)))
-           (anything-candidates-in-buffer))))
-    (display-to-real
-     . (lambda (line)
-         (if (string-match "\t\\[\\(.+\\)\\]$" line)
-             (propertize (substring line 0 (match-beginning 0))
-                         'desc (match-string 1 line))
-           line)))
-    (action
-     ("Completion" . anything-rct-complete)
-     ("RI" . anything-rct-ri))
-    (persistent-action . anything-rct-ri)))
-
-
-(defun rct-complete-symbol--anything ()
-  (interactive)
-  (let ((anything-execute-action-at-once-if-one t)
-        anything-samewindow)
-    (anything '(anything-c-source-complete-ruby
-                anything-c-source-complete-ruby-all))))
-
-(provide 'anything-rcodetools)
-
-;; How to save (DO NOT REMOVE!!)
-;; (emacswiki-post "anything-rcodetools.el")
-;;; install-elisp.el ends here
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/bin/rbtest b/bundles/ruby.tmbundle/Support/vendor/rcodetools/bin/rbtest
deleted file mode 100755
index ab51c9425..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/bin/rbtest
+++ /dev/null
@@ -1,266 +0,0 @@
-#! /usr/local/bin/ruby18
-# Copyright (c) 2006-2007 rubikitch <rubikitch@ruby-lang.org>
-#
-# Use and distribution subject to the terms of the Ruby license.
-
-USAGE = <<'XXX'
-Usage: rbtest SCRIPT [-S RUBY_INTERPRETER] [Test::Unit OPTIONS]
-Usage: rbtest [-h] [--help] [--example]
-
-I am rbtest, embedded Test::Unit executor for one-file scripts.
-Splitting a small script into many files (executables, libraries and tests) is cumbersome.
-And it is handy to put unit tests near implementations like D language, which has
-built-in unittest keyword.
-
-Embedded Test::Unit is simpler than vanilla Test::Unit.
-You do not have to define a Test::Unit::TestCase subclass,
-it is automagically defined and executed by me.
-Embedded Test::Unit uses =begin/=end comment blocks.
-
-"=begin TEST_METHOD_NAME" blocks define test methods, eg. "=begin test_foo".
-"=begin rbtest" blocks define utility methods and setup/teardown methods.
-
-Of course, you MUST use "if __FILE__ ==$0" idiom to split executable and class/method/function.
-
-I am also an real-life example of rbtest usage.
-Issue:
-  rbtest --example
-to show me.
-
-
-options:
-  -h, --help           Print usage.
-  -S RUBY_INTERPRETER  Use Ruby interpreter RUBY_INTERPRETER.
-  --example            Print this file.
-  --output             Print internally-generated test script (for debug). 
-XXX
-
-
-def first_test(script_filename)
-  "require 'test/unit';" +
-  "load '#{script_filename}';" +
-  "class TestByRbtest < Test::Unit::TestCase;"
-end
-
-=begin rbtest
-def setup
-end
-
-def unindent(s)
-  s.lines.map{|x| x[1..-1]}.join
-end
-=end
-
-=begin test_script_to_test_script
-# indent is needed to avoid syntax error.
-script = <<XXX
- #!/usr/bin/env ruby
- =begin test0
- assert_equal(10, f(1))
- =end
- def f(x) x*10 end
- =begin
- other block is skipped
- =end
- =begin test1
- assert_equal(100, f(10))
- =end
- puts f(99) if __FILE__==$0
-XXX
-
-test_script = <<'XXX'
- #!/usr/bin/env ruby
- require 'test/unit';load 'f.rb';class TestByRbtest < Test::Unit::TestCase;def test0
- assert_equal(10, f(1))
- end
- 
- 
- 
- 
- def test1
- assert_equal(100, f(10))
- end
- 
- end
-XXX
-assert_equal unindent(test_script), script_to_test_script(unindent(script), "f.rb")
-
-script = <<XXX
- =begin rbtest
- def setup() end
- =end
- def f(x) x*10 end
- =begin test1
- assert_equal(100, f(10))
- =end
- puts f(99) if __FILE__==$0
-XXX
-
-test_script = <<XXX
- require 'test/unit';load 'f.rb';class TestByRbtest < Test::Unit::TestCase;
- def setup() end
- 
- 
- def test1
- assert_equal(100, f(10))
- end
- 
- end
-XXX
-
-assert_equal unindent(test_script), script_to_test_script(unindent(script), "f.rb")
-=end
-
-def script_to_test_script(ruby_source, script_filename)
-  _SKIP = "\n"
-  state = :start
-  ruby_source.lines.map do |line|
-    case line
-    when /^#!/
-      line
-    when "=begin rbtest\n"
-      preamble = (state == :start) ? first_test(script_filename) : ""
-      state = :rbtest_block
-      preamble + "\n"
-    when /^=begin (test\S*)$/   # test method block
-      preamble = (state == :start) ? first_test(script_filename) : ""
-      state = :test_method
-      preamble + "def #{$1}\n"
-    when /^=begin/            # other block
-      state = :begin
-      _SKIP
-    when /^=end$/
-      begin
-        if state == :test_method
-          "end\n"                 # /def test_xxx
-        else
-          _SKIP
-        end
-      ensure
-        state = :script
-      end
-    else
-      if state == :test_method or state == :rbtest_block
-        line
-      else
-        _SKIP
-      end
-    end
-  end.join + "end\n"            # /class TestByRbtest
-end
-
-=begin test_execute_test_script_command
-require 'tempfile'
-temp = Tempfile.new "rbtest"
-test_script_filename = temp.path
-
-temp.puts "#!/usr/bin/ruby18"
-temp.flush
-assert_equal "/usr/bin/ruby18 #{test_script_filename} -v", execute_test_script_command(test_script_filename, parse_argv!(["a0.rb", "-v"]))
-
-temp.rewind
-temp.puts "class XX"
-temp.flush
-assert_equal "ruby #{test_script_filename} ", execute_test_script_command(test_script_filename, parse_argv!(["a0.rb"]))
-assert_equal "ruby18 #{test_script_filename} ", execute_test_script_command(test_script_filename, parse_argv!(["-S", "ruby18", "a0.rb"]))
-
-=end
-
-def shebang(filename)
-  open(filename) {|f| line = f.gets.chomp; line[0,2] == "#!" and line[2..-1] }
-end
-
-def execute_test_script_command(test_script_filename, args)
-  ruby = args.interpreter || shebang(test_script_filename) || "ruby"
-  "#{ruby} #{test_script_filename} #{args.opts.join ' '}"
-end
-
-def execute_test_script(test_script_filename, args)
-  output = `#{execute_test_script_command test_script_filename, args}`
-  print output.gsub(Regexp.union(test_script_filename), args.script_filename)
-end
-
-def generate_test_script(script_filename, test_script_filename)
-  open(test_script_filename, "w") do |f|
-    f.write(script_to_test_script(File.read(script_filename), script_filename))
-    f.chmod 0755                # executable
-  end
-end
-
-################
-def do_test(args)
-  begin
-    test_script_filename = "#{args.script_filename}__test__.rb"
-    generate_test_script(args.script_filename, test_script_filename)
-    execute_test_script(test_script_filename, args)
-  ensure
-    File.unlink test_script_filename
-  end
-end
-
-def output_test_script(args)
-  print(script_to_test_script(File.read(args.script_filename), args.script_filename))
-end
-
-def example(args)
-  print File.read($0)
-end
-
-def help(args)
-  print USAGE
-end
-
-=begin test_parse_argv_bang
-args = parse_argv!(["a.rb", "-S", "ruby19"])
-assert_equal "a.rb", args.script_filename
-assert_equal "ruby19", args.interpreter
-assert_equal [], args.opts
-assert_equal :do_test, args.action
-
-args = parse_argv!(["-S", "ruby19", "a.rb", "-v"])
-assert_equal "a.rb", args.script_filename
-assert_equal "ruby19", args.interpreter
-assert_equal ["-v"], args.opts
-assert_equal :do_test, args.action
-
-args = parse_argv!(["a.rb", "-n", "test_0"])
-assert_equal "a.rb", args.script_filename
-assert_equal nil, args.interpreter
-assert_equal ["-n", "test_0"], args.opts
-assert_equal :do_test, args.action
-
-assert_equal :help , parse_argv!([]).action
-assert_equal :help , parse_argv!(["--help"]).action
-assert_equal :help , parse_argv!(["-h"]).action
-
-args = parse_argv!(["--output", "a.rb"])
-assert_equal "a.rb", args.script_filename
-assert_equal :output_test_script, args.action
-
-assert_equal :example, parse_argv!(["--example"]).action
-
-=end
-
-Args = Struct.new :script_filename, :interpreter, :opts, :action
-def parse_argv!(argv)
-  args = Args.new
-  args.action = :do_test
-  argv.delete '--output' and args.action = :output_test_script
-  argv.delete '--example' and args.action = :example and return args
-  (argv.delete '-h' or argv.delete '--help') and args.action = :help
-  i = argv.index "-S"
-  if i and args.interpreter=argv[i+1]
-    argv.delete_at i+1
-    argv.delete_at i
-  end
-  args.script_filename = argv.shift
-  args.opts = argv
-  args.script_filename or args.action = :help
-  args
-end
-
-if __FILE__ ==$0
-  args = parse_argv! ARGV
-  __send__(args.action, args)
-end
-
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/bin/rct-complete b/bundles/ruby.tmbundle/Support/vendor/rcodetools/bin/rct-complete
deleted file mode 100644
index 9ae16c63a..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/bin/rct-complete
+++ /dev/null
@@ -1,45 +0,0 @@
-#! /usr/local/bin/ruby18
-require 'rcodetools/xmpfilter'
-require 'rcodetools/completion'
-require 'rcodetools/options'
-
-include Rcodetools
-options = DEFAULT_OPTIONS
-klass = XMPCompletionFilter
-
-opts = OptionParser.new do |opts|
-  opts.extend OptionHandler
-  opts.set_banner
-
-  opts.separator ""
-  opts.separator "Modes:"
-  opts.on("-C", "--completion", "List completion candidates.(default)") do
-    klass = XMPCompletionFilter
-  end
-  opts.on("--completion-emacs", "Generate completion code for Emacs.") do
-    klass = XMPCompletionEmacsFilter
-  end
-  opts.on("--completion-emacs-icicles", "Generate completion code for Emacs/Icicles.") do
-    klass = XMPCompletionEmacsIciclesFilter
-  end
-  opts.on("--completion-emacs-anything", "Generate completion code for Emacs/Anything.") do
-    klass = XMPCompletionEmacsAnythingFilter
-  end
-  opts.on("--completion-class-info", "List completion candidates with class.") do
-    klass = XMPCompletionClassInfoFilter
-  end
-
-  opts.handle_position options
-  opts.handle_interpreter options
-  opts.handle_misc options
-end
-
-set_extra_opts options
-opts.parse!(ARGV)
-check_opts options
-
-targetcode = ARGF.read
-Dir.chdir options[:wd] if options[:wd]
-XMPFilter.detect_rbtest(targetcode, options)
-# Do the job. dispatched by klass.
-puts klass.run(targetcode, options)
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/bin/rct-doc b/bundles/ruby.tmbundle/Support/vendor/rcodetools/bin/rct-doc
deleted file mode 100644
index 521873ccd..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/bin/rct-doc
+++ /dev/null
@@ -1,52 +0,0 @@
-#! /usr/local/bin/ruby18
-require 'rcodetools/xmpfilter'
-require 'rcodetools/doc'
-require 'rcodetools/options'
-
-include Rcodetools
-options = DEFAULT_OPTIONS
-klass = XMPDocFilter
-
-opts = OptionParser.new do |opts|
-  opts.extend OptionHandler
-  opts.set_banner
-
-  opts.separator ""
-  opts.separator "Modes:"
-  opts.on("-D", "--doc", "Print callee method with class.(default)") do
-    klass = XMPDocFilter
-  end
-  opts.on("--refe", "Refe callee method.") do
-    klass = XMPReFeFilter
-  end
-  opts.on("--ri", "Ri callee method.") do
-    klass = XMPRiFilter
-  end
-  opts.on("--ri-emacs", "Generate ri code for emacs.") do
-    klass = XMPRiEmacsFilter
-  end
-  opts.on("--ri-vim", "Generate ri code for vim.") do
-    klass = XMPRiVimFilter
-  end
-  opts.separator ""
-  opts.on("--use-method-analyzer", "") do |n|
-    options[:use_method_analyzer] = true
-  end
-  opts.on("--filename=FILENAME") do |n|
-    options[:filename] = File.expand_path n
-  end
-
-  opts.handle_position options
-  opts.handle_interpreter options
-  opts.handle_misc options
-end
-
-set_extra_opts options
-opts.parse!(ARGV)
-check_opts options
-
-targetcode = ARGF.read
-Dir.chdir options[:wd] if options[:wd]
-XMPFilter.detect_rbtest(targetcode, options)
-# Do the job. dispatched by klass.
-puts klass.run(targetcode, options)
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/bin/rct-fork b/bundles/ruby.tmbundle/Support/vendor/rcodetools/bin/rct-fork
deleted file mode 100644
index e1453d931..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/bin/rct-fork
+++ /dev/null
@@ -1,6 +0,0 @@
-#! /usr/local/bin/ruby18
-
-require 'rcodetools/fork'
-
-Rcodetools::Fork.start_server ARGV
-
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/bin/rct-fork-client b/bundles/ruby.tmbundle/Support/vendor/rcodetools/bin/rct-fork-client
deleted file mode 100644
index 3c408d569..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/bin/rct-fork-client
+++ /dev/null
@@ -1,5 +0,0 @@
-#! /usr/local/bin/ruby18
-
-require 'rcodetools/fork'
-
-Rcodetools::Fork.start_client ARGV
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/bin/rct-meth-args b/bundles/ruby.tmbundle/Support/vendor/rcodetools/bin/rct-meth-args
deleted file mode 100644
index 42509046d..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/bin/rct-meth-args
+++ /dev/null
@@ -1,442 +0,0 @@
-#! /usr/local/bin/ruby18
-# Copyright (c) 
-#  2006-2007 Mauricio Fernandez <mfp@acm.org>    http://eigenclass.org
-#  2006-2007 rubikitch <rubikitch@ruby-lang.org> http://www.rubyist.net/~rubikitch/
-#                    
-# Use and distribution subject to the same conditions as Ruby.
-
-require 'rcodetools/options'
-include Rcodetools
-$VERBOSE = nil
-$__method_args_off = true
-
-if ARGV.empty? or ARGV.include? '-h' or ARGV.include? '--help'
-  puts <<EOF
-rct-meth-args [-Idirectory] [-i] [-m] [-c] [-n] <file> [<file> ...]
-
--Idirectory   specify $LOAD_PATH directory (same as ruby)
---dev         Add this project's bin/ and lib/ to $LOAD_PATH.
-              A directory that has Rakefile is considered as project base direcotry.
--i            omit instance methods defined in classes
--m            omit instance methods defined in modules
--c            omit class methods
-
--n            print the filename and line number with output lines
--t            generate TAGS output
---summarize   summary output sorted by method name
-
-The given files will be #require()d in order.
-Examples:
-   rct-meth-args complex
-   rct-meth-args thread
-   rct-meth-args -c rubygems
-EOF
-  exit                          # '
-end
-
-def debugprint(*args)
-  $stderr.puts(*args) if $DEBUG
-end
-
-module MethodArgs
-  MAX_ARGS = 20
-
-  private
-  def needed_args(arity)
-    arity >= 0 ? arity : arity.abs - 1
-  end
-
-  def with_tracer
-    begin
-      set_trace_func @__trace_func
-      yield
-    ensure
-      set_trace_func nil
-    end
-  end
-
-  module LineContents
-    # usage: Contents[filename][lineno]
-    Contents = Hash.new{ |h,k|
-      sum = 0
-      # Unshift is needed because lineno starts with 1.
-      h[k] = File.readlines(k).map{ |line| [line.chomp, sum+=line.length] }.unshift nil
-    }
-    def content
-      Contents[filename][lineno.to_i][0] rescue ""
-    end
-
-    def byte
-      Contents[filename][lineno.to_i-1][1] rescue 0
-    end
-
-    def arg_desc
-      # TODO
-      desc = content[ /\((.+)\)/]
-      desc.gsub!(/(\S),(\S)/, '\1, \2')
-      desc.gsub!(/(\S)=(\S)/, '\1 = \2')
-      desc
-    end
-
-    FileNameCache = Hash.new{ |h,k| h[k] = File.expand_path(k) }
-    def full_filename
-      FileNameCache[filename]
-    end
-  end
-
-  class Location < Struct.new(:filename, :lineno)
-    include LineContents
-  end
-  
-  class Printer
-    def method_info(io, x)
-      prefix = x[:location] ? "#{x[:location].filename}:#{x[:location].lineno}:" : ""
-      io.puts "#{prefix}#{x[:fullname]}#{x[:arg_desc]}" unless x[:klass].to_s == "<Struct>"
-    end
-
-    def included_location(io, x)
-      x[:callsite] and io.print "#{x[:callsite].filename}:#{x[:callsite].lineno}:"
-      io.puts([ x[:comment], x[:mod], x[:flag], x[:self] ].join(" "))
-    end
-  end
-
-  class SummarizePrinter
-    def initialize
-      @hash = Hash.new
-      at_exit { print_result }
-    end
-
-    def method_info(io, x)
-      @io = io
-      prefix = x[:location] ? "#{x[:location].filename}:#{x[:location].lineno}:" : ""
-      (@hash[x[:meth]]||=[]) << "#{prefix}#{x[:fullname]}#{x[:arg_desc]}" unless x[:klass].to_s == "<Struct>"
-    end
-
-    def included_location(io, x)
-      # not implemented
-    end
-
-    def print_result
-      @hash.keys.sort.each do |meth|
-        @io.puts meth
-        @hash[meth].each do |line|
-          @io.puts line
-        end
-        @io.puts
-      end
-    end
-  end
-
-  class TagsPrinter
-    def initialize
-      @previous_filename = ""
-    end
-
-    def output_filename(filename)
-      if @previous_filename != filename
-        @previous_filename = filename
-        puts "\cl"
-        puts "#{filename},0"
-      end
-    end
-
-    def method_info(io, x)
-      return unless x[:location]
-      output_filename x[:location].full_filename
-      io.puts "#{x[:location].content}::#{x[:fullname]}
#{x[:location].lineno},#{x[:location].byte}"
-    end
-
-    def included_location(io, x)
-      return unless x[:callsite]
-      output_filename x[:callsite].full_filename
-      io.puts "#{x[:callsite].content}::#{x[:mod]}
#{x[:callsite].lineno},#{x[:callsite].byte}"
-    end
-  end
-
-  def _print_method_info(klass, is_singleton, meth, arg_desc=nil, location=nil, with_location=$__with_location, printer=$__printer)
-    arg_desc ||= "(...)"
-    arg_desc = " " + arg_desc unless arg_desc.empty?
-    flag = is_singleton ? "." : "#"
-    x = { :arg_desc => arg_desc, :klass => klass,
-      :meth => meth.to_s,
-      :fullname => [klass, flag, meth].join,
-      :location => with_location && location,
-    }
-    printer.method_info $>, x 
-  end
-
-  def output_attr_info(klass, object, meth, is_singleton, location)
-    arg_desc = meth.to_s =~ /=$/ ? "(value)" : ""
-    _print_method_info klass, is_singleton, meth, arg_desc, location
-  end
-
-  def output_method_info(klass, object, meth, is_singleton = false, by_attr = nil, by_define_method = nil)
-    return if $__method_args_off
-    file = line = params = values = nil
-    location = nil
-    begin
-      unless %w[initialize].include?(meth.to_s)
-        if is_singleton
-          return if class << klass; private_instance_methods(true) end.include?(meth.to_s)
-        else
-          return if class << object; private_instance_methods(true) end.include?(meth.to_s)
-        end
-      end
-    rescue TypeError          # no virtual class
-    end
-    
-    arity = is_singleton ? object.method(meth).arity : klass.instance_method(meth).arity
-    @__trace_func = lambda{|event, file, line, id, binding, classname|
-      begin
-        debugprint "!EVENT: #{event} #{classname}##{id}, #{file} #{line}"
-        debugprint "(#{self} #{meth})"
-        if event[/call/] && classname == self && id == meth
-          location = Location.new(file, line) if event == 'call'
-          debugprint "EVENT: #{event} #{classname}##{id}"
-          throw :done
-        end
-      rescue Exception
-        nil                     # rcov workaround
-      end
-    }
-    if by_define_method
-      _print_method_info klass, is_singleton, meth, nil, by_define_method
-      return
-    end
-    
-    if by_attr
-      output_attr_info klass, object, meth, is_singleton, by_attr
-      return
-    end
-    
-    catch(:done) do 
-      begin
-        with_tracer { object.send(meth, *(0...needed_args(arity))) }
-      rescue Exception
-        nil                 # rcov workaround
-      end
-    end
-    
-    arg_desc = location.arg_desc
-    
-    _print_method_info klass, is_singleton, meth, arg_desc, location
-  rescue Exception
-    debugprint "GOT EXCEPTION while processing #{klass} #{meth}"
-    debugprint $!.class
-    debugprint $!.message
-    debugprint $!.backtrace
-    _print_method_info klass, is_singleton, meth, nil, location
-  ensure
-    set_trace_func(nil)
-  end
-end
-
-class Object
-  include MethodArgs
-end
-
-class Module
-  class CallSite                # compatible with Location
-    include MethodArgs::LineContents
-    def initialize(caller_string)
-      @filename, @lineno, @in = caller_string.split(/:/)
-    end
-    attr_reader :filename, :lineno
-  end
-
-  def _method_defined_with(ivar, caller, &block)
-    begin
-      instance_variable_set(ivar, caller)
-      yield
-    ensure
-      instance_variable_set(ivar, false)
-    end
-  end
-
-  def with_attr(caller, &block)
-    _method_defined_with :@by_attr, caller, &block
-  end
-
-  def with_define_method(caller, &block)
-    _method_defined_with :@by_define_method, caller, &block
-  end
-
-  [ :attr, :attr_reader, :attr_writer, :attr_accessor ].each do |meth|
-    attr = instance_method(meth)
-    define_method(meth) do |*args|
-      with_attr(CallSite.new(caller(1)[0])){ attr.bind(self).call(*args) }
-    end
-  end
-
-  alias :__define_method_orig :define_method
-  def define_method(*args, &body)
-    with_define_method(CallSite.new(caller(1)[0])){ __define_method_orig(*args, &body) }
-  end
-
-end
-
-new_args = []
-omissions = {}
-$__with_location = false
-$__printer = Printer.new
-i_opt_p = false
-
-ARGV.each do |arg|
-  case arg
-  when "-n"; $__with_location = true
-  when "-t"; $__printer = TagsPrinter.new; $__with_location = true
-  when "--summarize"; $__printer = SummarizePrinter.new
-  when /-I(.+)$/; $:.unshift $1
-  when "-I"; i_opt_p = true
-  when "--dev"; OptionHandler.auto_include_paths($:, Dir.pwd)
-  when /^-.$/; omissions[$&] = true
-  else
-    if i_opt_p
-      $:.unshift arg
-      i_opt_p = false
-    else
-      new_args << arg
-    end
-  end
-end
-
-ARGV.replace new_args
-
-class Object
-  ALLOCATOR = Hash.new{|h,k| h[k] = k.allocate }.merge(Fixnum=>1,
-                                                       Bignum=>10000000000000000,
-                                                       Float=>1.1,
-                                                       Symbol=>:method_args_tmp,
-                                                       Binding=>binding,
-                                                       UnboundMethod=>instance_method(:object_id),
-                                                       Method=>method(:object_id),
-                                                       Proc=>lambda{},
-                                                       Continuation=>callcc{|c|c},
-                                                       Thread=>Thread.new{},
-                                                       FalseClass=>false,
-                                                       TrueClass=>true,
-                                                       NilClass=>nil,
-                                                       Struct=>Struct.new(:a).new(1))
-
-#  ABSTRACT_CLASSES = %w[Digest::Base ]
-  def self.method_added(meth)
-#     if ABSTRACT_CLASSES.include? self.to_s
-#       _print_method_info self, false, meth
-#       return
-#     end
-    begin
-      o = ALLOCATOR[self]
-    rescue Exception            # for abstract classes
-      nil
-    end
-    output_method_info(self, o, meth, false, @by_attr, @by_define_method)
-  end
-end unless omissions["-i"]
-
-class Module
-  method_added = instance_method(:method_added)
-  define_method(:method_added) do |meth|
-    begin
-      if instance_of? Module
-        o = Object.new
-        o.extend(self)
-        output_method_info(self, o, meth, false, @by_attr, @by_define_method)
-      end
-      method_added.bind(self).call(meth)
-    rescue Exception
-      _print_method_info self, false, meth
-    end
-  end
-end unless omissions["-m"]
-
-
-class Class
-  def singleton_method_added(meth)
-    by_attr = class << self; @by_attr; end
-    by_define_method = class << self; @by_define_method; end
-    output_method_info(self, self, meth, true, by_attr, by_define_method)
-  rescue Exception
-    _print_method_info self, true, meth
-  end
-end unless omissions["-c"]
-
-#### include / extend
-class Module
-  def _print_included_location(mod, caller_string, comment, flag, with_location=$__with_location, printer=$__printer)
-    if caller_string            # nil when the class is defined by C
-      x = { :comment => comment, :mod => mod, :flag => flag, :self => self,
-        :callsite => with_location && CallSite.new(caller_string)
-      }
-      printer.included_location $>, x
-    end
-  end
-
-  undef_method :included
-  def included(mod)
-    _print_included_location mod, caller(0)[1], "include", "<="
-  end
-
-  undef_method :extended
-  def extended(mod)
-    _print_included_location mod, caller(0)[1], "extend", "<-" if Module === mod
-  end
-end
-
-#### inheritance
-class Class
-  undef :inherited
-  def inherited(klass, caller_level=0)
-    _print_included_location klass, caller(caller_level)[1], "class", "<" unless self == Object
-  end
-end
-
-#### Struct inspection
-class << Struct
-  def to_s
-    orig = super
-    if orig =~ /<Class/
-      mems = instance_methods(false).select{ |m| m.to_s !~ /=$/}.sort.join(",")
-      mems.empty? ? "<Struct>" : "<Struct: #{mems}>"
-    else
-      orig
-    end
-  end
-
-  def inherited(klass)
-    if self == Struct
-      @inherited_delay = lambda{ super(klass, 3) }
-    else
-      super(klass, 1)
-    end
-  end
-
-  @@struct_initializing = false
-  def method_added(meth)
-    super unless @@struct_initializing
-  end
-
-  orig_new = instance_method(:new)
-  define_method(:new) do |*args|
-    begin
-      @@struct_initializing = true
-      orig_new.bind(self).call(*args)
-    ensure
-      @@struct_initializing = false
-      @inherited_delay[]
-    end
-  end
-
-end
-
-$__method_args_off = false
-
-ARGV.each{|x|
-  begin
-    require x
-  rescue LoadError
-    load x
-  end
-}
-
-$__method_args_off = true
-# END { puts "zzzz OK" }
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/bin/ruby-toggle-file b/bundles/ruby.tmbundle/Support/vendor/rcodetools/bin/ruby-toggle-file
deleted file mode 100644
index 9adccc929..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/bin/ruby-toggle-file
+++ /dev/null
@@ -1,26 +0,0 @@
-#! /usr/local/bin/ruby18
-require 'ruby_toggle_file'
-require 'optparse'
-
-USAGE = <<XXX
-Usage: ruby-toggle-file RUBY_SCRIPT
-
-I (ruby-toggle-file) accept one Ruby script filename and prints
-corresponding file.  If RUBY_SCRIPT is implementation script
-(library), then returns test script and vice versa.  It is recommended
-that implementation scripts are located in lib/ directory and test
-scripts are located in test/ directory. This command supports Ruby on
-Rails file layout.
-
-I infer corresponding file if it does not exist.
-
-If you are curious about behavior, see test/test_ruby_toggle_file.rb.
-
-I am meant to be used in text editors or IDEs.
-XXX
-
-ARGV.options {|o|
-  o.banner = USAGE
-  o.parse!
-}
-print RubyToggleFile.new.ruby_toggle_file(ARGV.first)
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/bin/xmpfilter b/bundles/ruby.tmbundle/Support/vendor/rcodetools/bin/xmpfilter
deleted file mode 100644
index 2305ec31d..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/bin/xmpfilter
+++ /dev/null
@@ -1,85 +0,0 @@
-#! /usr/local/bin/ruby18
-require 'rcodetools/xmpfilter'
-require 'rcodetools/options'
-
-include Rcodetools
-options = DEFAULT_OPTIONS
-rails_settings = false
-klass = XMPFilter
-
-opts = OptionParser.new do |opts|
-  opts.extend OptionHandler
-  opts.set_banner
-
-  opts.separator ""
-  opts.separator "Modes:"
-  opts.on("-a", "--annotations", "Annotate code (default)") do
-    klass = XMPFilter
-  end
-  opts.on("-u", "--unittest", "Complete Test::Unit assertions.") do 
-    require 'rcodetools/xmptestunitfilter'
-    klass = XMPTestUnitFilter
-  end
-  opts.on("-s", "--spec", "Complete RSpec expectations.") do
-    require 'rcodetools/xmptestunitfilter'
-    klass = XMPRSpecFilter
-    options[:interpreter] = "spec"
-  end
-  opts.on("--expectations", "Complete expectations expectations.") do
-    require 'rcodetools/xmptestunitfilter'
-    klass = XMPExpectationsFilter
-  end
-  opts.on("-m", "--markers", "Add # => markers.") do
-    klass = XMPAddMarkers
-  end
-
-  opts.handle_interpreter options
-
-  opts.separator ""
-  opts.separator "Specific options:"
-  opts.on("-l N", "--min-line-length N", Integer, "Align markers to N spaces.") do |min_codeline_size|
-    options[:min_codeline_size] = min_codeline_size
-  end
-  opts.on("--rails", "Setting appropriate for Rails.",
-          "(no warnings, find working directory,",
-          " Test::Unit assertions)") do 
-    require 'rcodetools/xmptestunitfilter'
-    options[:warnings] = false
-    klass = XMPTestUnitFilter
-    rails_settings = true
-  end
-  opts.on("--[no-]poetry", "Whether to use extra parentheses.",
-          "(default: use them)") do |poetry_p|
-    options[:use_parentheses] = !poetry_p
-  end
-  opts.on("--[no-]warnings", "Whether to add warnings (# !>).", 
-          "(default: enabled)") {|warnings_p| options[:warnings] = warnings_p }
-  opts.on("-q", "--quiet", "Supress standard output.") do
-    options[:output_stdout] = false
-  end
-
-  opts.handle_misc options
-end
-
-set_extra_opts options
-opts.parse!(ARGV)
-
-if rails_settings && !options[:wd]
-  if File.exist? ARGF.path
-    options[:wd] = File.dirname(ARGF.path)
-  elsif File.exist? "test/unit"
-    options[:wd] = "test/unit"
-  elsif File.exist? "unit"
-    options[:wd] = "unit"
-  end
-end
-targetcode = ARGF.read
-Dir.chdir options[:wd] if options[:wd]
-
-if XMPFilter.detect_rbtest(targetcode, options)
-  require 'rcodetools/xmptestunitfilter'
-  klass = XMPTestUnitFilter
-end
-
-# Do the job. dispatched by klass.
-puts klass.run(targetcode, options)
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/icicles-rcodetools.el b/bundles/ruby.tmbundle/Support/vendor/rcodetools/icicles-rcodetools.el
deleted file mode 100644
index a6de2ca6e..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/icicles-rcodetools.el
+++ /dev/null
@@ -1,35 +0,0 @@
-;;; icicles-rcodetools.el -- accurate completion with icicles
-
-;;; Copyright (c) 2006-2007 rubikitch <rubikitch@ruby-lang.org>
-;;;
-;;; Use and distribution subject to the terms of the Ruby license.
-
-(require 'icicles)
-(require 'rcodetools)
-
-(setq rct-complete-symbol-function 'rct-complete-symbol--icicles)
-(icicle-define-command rct-complete-symbol--icicles
-                         "Perform ruby method and class completion on the text around point with icicles.
-C-M-RET shows RI documentation on each candidate.
-See also `rct-interactive'."
-
-                       (lambda (result)
-                         (save-excursion
-                           (search-backward pattern)
-                           (setq beg (point)))
-                         (delete-region beg end)
-                         (insert result)) ;/function
-                       "rct-complete: "       ;prompt
-                       rct-method-completion-table
-                       nil nil pattern nil nil nil
-                       ((end (point)) beg
-                        (icicle-list-join-string "\t")
-                        (icicle-list-use-nth-parts '(1))
-                        (icicle-point-position-in-candidate 'input-end)
-                        pattern klass alist
-                        (icicle-candidate-help-fn
-                         (lambda (result)
-                           (ri (cdr (assoc result alist)))))) ;bindings
-                       (rct-exec-and-eval rct-complete-command-name "--completion-emacs-icicles"))
-
-(provide 'icicles-rcodetools)
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/lib/method_analyzer.rb b/bundles/ruby.tmbundle/Support/vendor/rcodetools/lib/method_analyzer.rb
deleted file mode 100644
index 4f71cc274..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/lib/method_analyzer.rb
+++ /dev/null
@@ -1,107 +0,0 @@
-class Module
-  remove_method :attr_reader
-  def attr_reader(*names)
-    names.each do |name|
-      module_eval "def #{name}() @#{name} end"
-    end
-  end
-  remove_method :attr_writer
-  def attr_writer(*names)
-    names.each do |name|
-      module_eval "def #{name}=(x) @#{name}=x end"
-    end
-  end
-  remove_method :attr_accessor
-  def attr_accessor(*names)
-    attr_reader(*names)
-    attr_writer(*names)
-  end
-  remove_method :attr
-  def attr(name, writer=false)
-    attr_reader name
-    attr_writer name if writer
-  end
-end
-
-
-module MethodAnalyzer
-  @@methods = Hash.new{ |h,k| h[k] = Hash.new{ |h,k| h[k] = []} }
-  @@whereis = []
-  @@expand_path = Hash.new{ |h,k| h[k] = File.expand_path(k)}
-  
-  def self.trace_func(event, file, line, id, binding, klass, *rest)
-    return if file == __FILE__
-    return if (event != 'call' and event != 'c-call')
-    return if klass == Class and id == :inherited
-    return if klass == Module and id == :method_added
-    return if klass == Kernel and id == :singleton_method_added
-    saved_crit = Thread.critical
-    Thread.critical = true
-    
-    the_self = eval("self",binding)
-    flag = Class === the_self ? "." : "#"
-    #klass = klass == Kernel ? Object : klass
-    fullname = "#{klass}#{flag}#{id}"
-    file.replace @@expand_path[file]
-    if event == 'call'
-      @@whereis << [file, line, fullname] if file !~ /\(eval\)$/
-      file, line, rest = caller(4)[0].split(/:/)
-      file.replace @@expand_path[file] # DRY
-      p caller(0) if $DEBUG
-      line = line.to_i
-    end
-    @@methods[file][line] << fullname  if event =~ /call/
-
-    Thread.critical = saved_crit
-  end
-
-  def self.at_exit__output_marshal
-    at_exit do
-      set_trace_func nil
-      dbfile = "method_analysis"
-      old = Marshal.load(File.read(dbfile)) rescue {}
-      open(dbfile, "wb") do |io|
-        # Because Marshal.dump cannot handle hashes with default_proc
-        @@methods.default = nil
-        @@methods.each_value{ |v| v.default=nil; v.each_value{ |vv| vv.uniq! } }
-        Marshal.dump(@@methods.merge(old), io)
-      end
-    end
-  end
-
-
-  def self.at_exit__output_text
-    at_exit do
-      set_trace_func nil
-      puts "method fullnames"
-      @@methods.sort.each do |file, lines|
-        lines.sort.each do |line, methods|
-          printf "%s:%s:%s\n", file, line, methods.uniq.join(" ")
-        end
-      end
-
-      puts
-      puts "method definitions"
-      @@whereis.sort.uniq.each do |file, line, fullname |
-        printf "%s:%s:%s\n", file, line, fullname
-      end
-
-    end
-  end
-
-  def self.set_at_exit
-    case ENV['METHOD_ANALYZER_FORMAT']
-    when 'marshal'
-      at_exit__output_marshal
-    else
-      at_exit__output_text
-    end
-  end
-
-  set_at_exit
-  set_trace_func method(:trace_func).to_proc
-end
-
-if __FILE__ == $0
-  load "./test/data/method_analyzer-data.rb"
-end
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/lib/rcodetools/compat.rb b/bundles/ruby.tmbundle/Support/vendor/rcodetools/lib/rcodetools/compat.rb
deleted file mode 100644
index 13e50832b..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/lib/rcodetools/compat.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-if RUBY_VERSION >= "1.9"
-  class String
-    alias :each :each_line
-    include Enumerable
-  end
-
-  module Enumerable
-    alias :enum_with_index :each_with_index
-  end
-
-  class Array
-    alias :to_s :join
-  end
-end
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/lib/rcodetools/completion.rb b/bundles/ruby.tmbundle/Support/vendor/rcodetools/lib/rcodetools/completion.rb
deleted file mode 100644
index ccc936a3c..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/lib/rcodetools/completion.rb
+++ /dev/null
@@ -1,406 +0,0 @@
-# Nearly 100% accurate completion for any editors!!
-#  by rubikitch <rubikitch@ruby-lang.org>
-
-require 'rcodetools/xmpfilter'
-require 'enumerator'
-
-module Rcodetools
-
-# Common routines for XMPCompletionFilter/XMPDocFilter
-module ProcessParticularLine
-  def fill_literal!(expr)
-    [ "\"", "'", "`" ].each do |q|
-      expr.gsub!(/#{q}(.+)#{q}/){ '"' + "x"*$1.length + '"' }
-    end
-    expr.gsub!(/(%([wWqQxrs])?(\W))(.+?)\3/){
-      percent = $2 == 'x' ? '%'+$3 : $1 # avoid executing shell command
-      percent + "x"*$4.length + $3
-    }
-    [ %w[( )], %w[{ }], %w![ ]!, %w[< >] ].each do |b,e|
-      rb, re = [b,e].map{ |x| Regexp.quote(x)}
-      expr.gsub!(/(%([wWqQxrs])?(#{rb}))(.+)#{re}/){
-        percent = $2 == 'x' ? '%'+$3 : $1 # avoid executing shell command
-        percent + "x"*$4.length + e
-      }
-    end
-  end
-
-  module ExpressionExtension
-    attr_accessor :eval_string
-    attr_accessor :meth
-  end
-  OPERATOR_CHARS = '\|^&<>=~\+\-\*\/%\['
-  def set_expr_and_postfix!(expr, column, &regexp)
-    expr.extend ExpressionExtension
-
-    @postfix = ""
-    expr_orig = expr.clone
-    column ||= expr.length
-    last_char = expr[column-1]
-    expr.replace expr[ regexp[column] ]
-    debugprint "expr_orig=#{expr_orig}", "expr(sliced)=#{expr}"
-    right_stripped = Regexp.last_match.post_match
-    _handle_do_end right_stripped
-    aref_or_aset = aref_or_aset? right_stripped, last_char
-    debugprint "aref_or_aset=#{aref_or_aset.inspect}"
-    set_last_word! expr, aref_or_aset
-    fill_literal! expr_orig
-    _handle_brackets expr_orig, expr
-    expr << aref_or_aset if aref_or_aset
-    _handle_keywords expr_orig, column
-    debugprint "expr(processed)=#{expr}"
-    expr
-  end
-
-  def _handle_do_end(right_stripped)
-    right_stripped << "\n"
-    n_do = right_stripped.scan(/[\s\)]do\s/).length
-    n_end = right_stripped.scan(/\bend\b/).length
-    @postfix = ";begin" * (n_do - n_end)
-  end
-
-  def _handle_brackets(expr_orig, expr)
-    [ %w[{ }], %w[( )], %w![ ]! ].each do |left, right|
-      n_left  = expr_orig.count(left)  - expr.count(left)
-      n_right = expr_orig.count(right) - expr.count(right)
-      n = n_left - n_right
-      @postfix << ";#{left}" * n if n >= 0
-    end
-  end
-
-  def _handle_keywords(expr_orig, column)
-    %w[if unless while until for].each do |keyw|
-      pos = expr_orig.index(/\b#{keyw}\b/)
-      @postfix << ";begin" if pos and pos < column # if * xxx
-
-      pos = expr_orig.index(/;\s*#{keyw}\b/)
-      @postfix << ";begin" if pos and column < pos # * ; if xxx
-    end
-  end
-
-  def aref_or_aset?(right_stripped, last_char)
-    if last_char == ?[
-      case right_stripped
-      when /\]\s*=/ then "[]="
-      when /\]/     then "[]"
-      end
-    end
-  end
-
-  def set_last_word!(expr, aref_or_aset=nil)
-    debugprint "expr(before set_last_word)=#{expr}"
-    if aref_or_aset
-      opchars = "" 
-    else
-      opchars = expr.slice!(/\s*[#{OPERATOR_CHARS}]+$/)
-      debugprint "expr(strip opchars)=#{expr}"
-    end
-    
-    expr.replace(if expr =~ /[\"\'\`]$/      # String operations
-                   "''"
-                 else
-                   fill_literal! expr
-                   phrase = current_phrase(expr)
-                   if aref_or_aset
-                     expr.eval_string = expr[0..-2]
-                     expr.meth = aref_or_aset
-                   elsif phrase.match( /^(.+)\.(.*)$/ )
-                     expr.eval_string, expr.meth = $1, $2
-                   elsif opchars != ''
-                     expr
-                   end
-                   debugprint "expr.eval_string=#{expr.eval_string}", "expr.meth=#{expr.meth}"
-                   phrase
-                 end << (opchars || '')) # ` font-lock hack
-    debugprint "expr(after set_last_word)=#{expr}"
-  end
-
-  def current_phrase(expr)
-    paren_level = 0
-    start = 0
-    (expr.length-1).downto(0) do |i|
-      c = expr[i,1]
-      if c =~ /[\)\}\]]/
-        paren_level += 1
-        next
-      end
-      if paren_level > 0
-        next if c =~ /[, ]/
-      else
-        break (start = i+1) if c =~ /[ ,\(\{\[]/
-      end
-      if c =~ /[\(\{\[]/
-        paren_level -= 1
-        break (start = i+1) if paren_level < 0
-      end
-    end
-    expr[start..-1]
-  end
-
-  def add_BEGIN
-    <<XXX
-BEGIN {
-class Object
-  def method_missing(meth, *args, &block)
-    # ignore NoMethodError
-  end
-end
-}
-XXX
-  end
-
-  class RuntimeDataError < RuntimeError; end
-  class NewCodeError < Exception; end
-  def runtime_data_with_class(code, lineno, column=nil)
-    newcode = code.to_a.enum_with_index.map{|line, i|
-      i+1==lineno ? prepare_line(line.chomp, column) : line
-    }.join
-    newcode << add_BEGIN if @ignore_NoMethodError
-    debugprint "newcode", newcode.gsub(/;/, "\n"), "-"*80
-    stdout, stderr = execute(newcode)
-    output = stderr.readlines
-    debugprint "stderr", output, "-"*80
-    output = output.reject{|x| /^-:[0-9]+: warning/.match(x)}
-    runtime_data = extract_data(output)
-    if exception = /^-:[0-9]+:.*/m.match(output.join)
-      raise NewCodeError, exception[0].chomp
-    end
-    begin
-      dat = runtime_data.results[1][0]
-      debugprint "dat = #{dat.inspect}"
-      [dat[0], dat[1..-1].to_s]
-    rescue
-      raise RuntimeDataError, runtime_data.inspect
-    end
-  end
-
-  def runtime_data(code, lineno, column=nil)
-    runtime_data_with_class(code, lineno, column)[1]
-  end
-
-  def __magic_help_code(result, v, meth)
-    code = <<-EOC
-  #{result} = #{v}.method(#{meth}).inspect.match( %r[\\A#<(?:Unbound)?Method: (.*?)>\\Z] )[1].sub(/\\A.*?\\((.*?)\\)(.*)\\Z/){ "\#{$1}\#{$2}" }.sub(/#<Class:(.*?)>#/) { "\#{$1}." }
-  #{result} = #{v}.to_s + ".new" if #{result} == 'Class#new' and #{v}.private_method_defined?(:initialize)
-  #{result} = "Object#" + #{meth} if #{result} =~ /^Kernel#/ and Kernel.instance_methods(false).map{|x| x.to_s}.include? #{meth}
-  #{result}
-EOC
-  end
-
-end
-
-# Nearly 100% accurate completion for any editors!!
-#  by rubikitch <rubikitch@ruby-lang.org>
-class XMPCompletionFilter < XMPFilter
-  include ProcessParticularLine
-
-  class << self
-    attr_accessor :candidates_with_description_flag
-  end
-  @candidates_with_description_flag = false
-
-  # String completion begins with this.
-  attr :prefix
-
-  def self.run(code, opts)
-    new(opts).completion_code(code, opts[:lineno], opts[:column])
-  end
-
-  def magic_help_code(recv, meth)
-    oneline_ize __magic_help_code("#{VAR}_result", recv, meth)
-  end
-
-  def methods_map_code(recv)
-    # delimiter is \0
-    m = "#{VAR}_m"
-    mhc = magic_help_code((recv), m)
-    %Q[map{|%s| "\#{%s}\\0" + %s}] % [m, m, mhc]
-  end
-
-  def split_method_info(minfo)
-    minfo.split(/\0/,2)
-  end
-
-  def prepare_line(expr, column)
-    set_expr_and_postfix!(expr, column){|c| /^.{#{c}}/ }
-    @prefix = expr
-    case expr
-    when /^\$\w*$/              # global variable
-      __prepare_line 'nil', 'global_variables', '%n'
-    when /^@@\w*$/              # class variable
-      __prepare_line 'nil', 'Module === self ? class_variables : self.class.class_variables', '%n'
-    when /^@\w*$/               # instance variable
-      __prepare_line 'nil', 'instance_variables', '%n'
-    when /^([A-Z].*)::([^.]*)$/    # nested constants / class methods
-      @prefix = $2
-      __prepare_line $1, "#$1.constants | #$1.methods(true)",
-      %Q[#$1.constants + #$1.methods(true).#{methods_map_code($1)}]
-    when /^[A-Z]\w*$/           # normal constants
-      __prepare_line 'nil', 'Module.constants', '%n'
-    when /^(.*::.+)\.(.*)$/       # toplevel class methods
-      @prefix = $2
-      __prepare_line $1, "#$1.methods",
-      %Q[%n.#{methods_map_code($1)}]
-    when /^(::.+)::(.*)$/       # toplevel nested constants
-      @prefix = $2
-      __prepare_line $1, "#$1.constants | #$1.methods",
-      %Q[#$1.constants + #$1.methods.#{methods_map_code($1)}]
-    when /^::(.*)/              # toplevel constant
-      @prefix = $1
-      __prepare_line 'nil', 'Object.constants', '%n'
-    when /^(:[^:.]*)$/          # symbol
-      __prepare_line 'nil', 'Symbol.all_symbols.map{|s| ":" + s.id2name}', '%n'
-    when /\.([^.]*)$/           # method call
-      @prefix = $1
-      recv = Regexp.last_match.pre_match
-      __prepare_line recv, "(#{recv}).methods(true)",
-      %Q[%n.#{methods_map_code(recv)}]
-    else                        # bare words
-      __prepare_line 'self', "methods | private_methods | local_variables | self.class.constants",
-      %Q[(methods | private_methods).#{methods_map_code('self')} + local_variables | self.class.constants]
-    end
-  end
-
-  def __prepare_line(recv, all_completion_expr, all_completion_expr_verbose)
-    if self.class.candidates_with_description_flag
-      ___prepare_line(recv, all_completion_expr_verbose.gsub(/%n/, '('+all_completion_expr+')'))
-    else
-      ___prepare_line(recv, all_completion_expr) 
-    end
-
-  end
-
-  def ___prepare_line(recv, all_completion_expr)
-    v = "#{VAR}"
-    rcv = "#{VAR}_recv"
-    idx = 1
-    oneline_ize(<<EOC)
-#{rcv} = (#{recv})
-#{v} = (#{all_completion_expr}).map{|x| x.to_s}.grep(/^#{Regexp.quote(@prefix)}/)
-#{rcv} = Module === #{rcv} ? #{rcv} : #{rcv}.class
-$stderr.puts("#{MARKER}[#{idx}] => " + #{rcv}.to_s  + " " + #{v}.join(" ")) || #{v}
-exit
-EOC
-  end
-
-  def candidates_with_class(code, lineno, column=nil)
-    klass, methods = runtime_data_with_class(code, lineno, column) rescue ["", ""]
-    raise NoCandidates, "No candidates." if methods.nil? or methods.empty?
-    [klass, methods.split(/ /).sort]
-  end
-
-  # Array of completion candidates.
-  class NoCandidates < RuntimeError;  end
-  def candidates(code, lineno, column=nil)
-    candidates_with_class(code, lineno, column)[1]
-  end
-
-  # Completion code for editors.
-  def completion_code(code, lineno, column=nil)
-    candidates(code, lineno, column).join("\n") rescue "\n"
-  end
-end
-
-# for debugging XMPCompletionEmacsFilter
-class XMPCompletionVerboseFilter < XMPCompletionFilter
-  @candidates_with_description_flag = true
-end
-
-class XMPCompletionClassInfoFilter < XMPCompletionFilter
-  @candidates_with_description_flag = true
-
-  def completion_code(code, lineno, column=nil)
-    candidates(code, lineno, column).join("\n").tr("\0", "\t")
-  rescue NoCandidates
-    ""
-  end
-end
-
-class XMPCompletionEmacsFilter < XMPCompletionFilter
-  @candidates_with_description_flag = true
-
-  def completion_code(code, lineno, column=nil)
-    elisp = "(progn\n"
-    table = "(setq rct-method-completion-table '("
-    alist = "(setq alist '("
-    begin
-      candidates(code, lineno, column).sort.each do |minfo|
-        meth, description = split_method_info(minfo)
-        table << format('("%s") ', meth)
-        alist << format('("%s\\t[%s]") ', meth, description)
-      end
-      table << "))\n"
-      alist << "))\n"
-    rescue Exception => err
-      return error_code(err)
-    end
-    elisp << table << alist
-    elisp << %Q[(setq pattern "#{prefix}")\n]
-    elisp << %Q[(try-completion pattern rct-method-completion-table nil)\n]
-    elisp << ")"                # /progn
-  end
-
-  def error_code(err)
-    case err
-    when NoCandidates
-      %Q[(error "#{err.message}")]
-    else
-      %Q[(error "#{err.message}\n#{err.backtrace.join("\n")}")]
-    end
-
-  end
-end
-
-class XMPCompletionEmacsIciclesFilter < XMPCompletionEmacsFilter
-  @candidates_with_description_flag = true
-
-  def completion_code(code, lineno, column=nil)
-    elisp = "(progn\n"
-    table = "(setq rct-method-completion-table '("
-    help_alist = "(setq alist '("
-    
-    begin
-      klass, cands = candidates_with_class(code, lineno, column)
-      cands.sort.each do |minfo|
-        meth, description = split_method_info(minfo)
-        table << format('("%s\\t[%s]") ', meth, description)
-        help_alist << format('("%s" . "%s")', meth, description)
-      end
-      table << "))\n"
-      help_alist << "))\n"
-    rescue Exception => err
-      return error_code(err)
-    end
-    elisp << table << help_alist
-    elisp << %Q[(setq pattern "#{prefix}")\n]
-    elisp << %Q[(setq klass "#{klass}")\n]
-    elisp << ")"                # /progn
-  end
-end
-
-class XMPCompletionEmacsAnythingFilter < XMPCompletionEmacsFilter
-  @candidates_with_description_flag = true
-
-  def completion_code(code, lineno, column=nil)
-    elisp = "(progn\n"
-    table = "(setq rct-method-completion-table `("
-    
-    begin
-      klass, cands = candidates_with_class(code, lineno, column)
-      cands.sort.each do |minfo|
-        meth, description = split_method_info(minfo)
-        table << format('("%s\\t[%s]" . ,(propertize "%s" \'desc "%s")) ',
-          meth, description, meth, description)
-      end
-      table << "))\n"
-    rescue Exception => err
-      return error_code(err)
-    end
-    elisp << table
-    elisp << %Q[(setq pattern "#{prefix}")\n]
-    elisp << %Q[(setq klass "#{klass}")\n]
-    elisp << ")"                # /progn
-  end
-end
-
-end
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/lib/rcodetools/doc.rb b/bundles/ruby.tmbundle/Support/vendor/rcodetools/lib/rcodetools/doc.rb
deleted file mode 100644
index 9a3e752db..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/lib/rcodetools/doc.rb
+++ /dev/null
@@ -1,168 +0,0 @@
-require 'rcodetools/completion'
-# Call Ri for any editors!!
-#  by rubikitch <rubikitch@ruby-lang.org>
-module Rcodetools
-
-class XMPDocFilter < XMPFilter
-  include ProcessParticularLine
-
-  def initialize(opts = {})
-    super
-    @filename = opts[:filename]
-    extend UseMethodAnalyzer if opts[:use_method_analyzer]
-  end
-
-  def self.run(code, opts)
-    new(opts).doc(code, opts[:lineno], opts[:column])
-  end
-
-  def prepare_line(expr, column)
-    set_expr_and_postfix!(expr, column){|c| 
-      withop_re = /^.{#{c-1}}[#{OPERATOR_CHARS}]+/
-      if expr =~ withop_re
-        withop_re
-      else
-        /^.{#{c}}[\w#{OPERATOR_CHARS}]*/
-      end
-    }
-    recv = expr
-
-    # When expr already knows receiver and method,
-    return(__prepare_line :recv => expr.eval_string, :meth => expr.meth) if expr.eval_string
-
-    case expr
-    when /^(?:::)?([A-Z].*)(?:::|\.)(.*)$/    # nested constants / class methods
-      __prepare_line :klass => $1, :meth_or_constant => $2
-    when /^(?:::)?[A-Z]/               # normal constants
-      __prepare_line :klass => expr
-    when /\.([^.]*)$/             # method call
-      __prepare_line :recv => Regexp.last_match.pre_match, :meth => $1
-    when /^(.+)(\[\]=?)$/                   # [], []=
-      __prepare_line :recv => $1, :meth => $2
-    when /[#{OPERATOR_CHARS}]+$/                   # operator
-      __prepare_line :recv => Regexp.last_match.pre_match, :meth => $&
-    else                        # bare words
-      __prepare_line :recv => "self", :meth => expr
-    end
-  end
-
-  def __prepare_line(x)
-    v = "#{VAR}"
-    result = "#{VAR}_result"
-    klass = "#{VAR}_klass"
-    flag = "#{VAR}_flag"
-    which_methods = "#{VAR}_methods"
-    ancestor_class = "#{VAR}_ancestor_class"
-    idx = 1
-    recv = x[:recv] || x[:klass] || raise(ArgumentError, "need :recv or :klass")
-    meth = x[:meth_or_constant] || x[:meth]
-    debugprint "recv=#{recv}", "meth=#{meth}"
-    if meth
-      # imported from fastri/MagicHelp
-      code = <<-EOC
-#{v} = (#{recv})
-$stderr.print("#{MARKER}[#{idx}] => " + #{v}.class.to_s  + " ")
-
-if Module === #{v} and '#{meth}' =~ /^[A-Z]/ and #{v}.const_defined?('#{meth}')
-  #{result} = #{v}.to_s + "::#{meth}"
-else
-  #{__magic_help_code result, v, meth.dump}
-end
-
-$stderr.puts(#{result})
-exit
-      EOC
-    else
-      code = <<-EOC
-#{v} = (#{recv})
-$stderr.print("#{MARKER}[#{idx}] => " + #{v}.class.to_s  + " ")
-$stderr.puts(#{v}.to_s)
-exit
-      EOC
-    end
-    oneline_ize(code)
-  end
-
-  # overridable by module
-  def _doc(code, lineno, column)
-  end
-
-  def doc(code, lineno, column=nil)
-    _doc(code, lineno, column) or runtime_data(code, lineno, column).to_s
-  end
-
-  module UseMethodAnalyzer
-    METHOD_ANALYSIS = "method_analysis"
-    def have_method_analysis
-      File.file? METHOD_ANALYSIS
-    end
-
-    def find_method_analysis
-      here = Dir.pwd
-      oldpwd = here
-      begin
-        while ! have_method_analysis
-          Dir.chdir("..")
-          if Dir.pwd == here
-            return nil          # not found
-          end
-          here = Dir.pwd
-        end
-      ensure
-        Dir.chdir oldpwd
-      end
-      yield(File.join(here, METHOD_ANALYSIS))
-    end
-
-    def _doc(code, lineno, column=nil)
-      find_method_analysis do |ma_file|
-        methods = open(ma_file, "rb"){ |f| Marshal.load(f)}
-        line = File.readlines(@filename)[lineno-1]
-        current_method = line[ /^.{#{column}}\w*/][ /\w+[\?!]?$/ ].sub(/:+/,'')
-        filename = @filename  # FIXME
-        begin 
-          methods[filename][lineno].grep(Regexp.new(Regexp.quote(current_method)))[0]
-        rescue NoMethodError
-          raise "doc/method_analyzer:cannot find #{current_method}"
-        end
-
-      end
-    end
-  end
-
-end
-
-# ReFe is so-called `Japanese Ri'.
-class XMPReFeFilter < XMPDocFilter
-  def doc(code, lineno, column=nil)
-    "refe '#{super}'"
-  end
-end
-
-class XMPRiFilter < XMPDocFilter
-  def doc(code, lineno, column=nil)
-    "ri '#{super.sub(/\./, '::')}'"
-  end
-end
-
-class XMPRiEmacsFilter < XMPDocFilter
-  def doc(code, lineno, column=nil)
-    begin 
-      %!(rct-find-tag-or-ri "#{super}")!
-    rescue Exception => err
-      return %Q[(error "#{err.message}")]
-    end
-  end
-end
-
-class XMPRiVimFilter < XMPDocFilter
-  def doc(code, lineno, column=nil)
-    begin
-      %{call RCT_find_tag_or_ri("#{super}")}
-    rescue Exception => err
-      return %Q[echo #{err.message.inspect}]
-    end
-  end
-end
-
-end
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/lib/rcodetools/fork.rb b/bundles/ruby.tmbundle/Support/vendor/rcodetools/lib/rcodetools/fork.rb
deleted file mode 100644
index 87fc2645c..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/lib/rcodetools/fork.rb
+++ /dev/null
@@ -1,210 +0,0 @@
-## Rcodetools version of ruby_fork
-# 
-# Based on ruby_fork.rb by Ryan Davis, Eric Hodel, Zen Spider Software
-#
-#  (The MIT License)
-#
-#  Copyright (c) 2006 Ryan Davis, Eric Hodel, Zen Spider Software <support@zenspider.com>
-#                2007 rubikitch <rubikitch@ruby-lang.org>
-#
-# 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 'optparse'
-require 'socket'
-require 'rcodetools/fork_config'
-
-module Rcodetools
-module Fork
-
-  USAGE_HELP = <<XXX
-
-rct-fork and rct-fork-client (we) are originally ruby_fork/ruby_fork_client in ZenTest by Zen Spider Software and are slightly modified for rcodetools.
-Completion or document browsing in a script with heavy libraries such as Rails takes a significant latency.
-We eliminate constant overhead of loading heavy libraries.
-
-rct-fork loads libraries you want to pre-load and opens up a server socket and waits for connection. When a connection comes in rct-fork forks to make a copy of the environment. rct-fork loads rubygems at startup.
-
-rct-fork-client connects to the rct-fork server and runs script in server's environment.
-
-xmpfilter/rct-complete/rct-doc can auto-detect rct-fork process with --fork option.
-This means that once you start up rct-fork, you do not have to start up rct-fork-client manually.
-
-demo/fork-demo.sh shows rct-fork example.
-
-!!WARNING!!
-We are only meant to run xmpfilter/rct-complete/rct-doc!
-If you want to run other programs, use original ruby_fork/ruby_fork_client.
-XXX
-  # '
-
-  DEFAULT_SETTINGS = {
-    :requires => [],
-    :code => [],
-    :extra_paths => [],
-    :port => PORT,
-  }
-
-  def self.add_env_args(opts, settings)
-    opts.separator ''
-    opts.separator 'Process environment options:'
-
-    opts.separator ''
-    opts.on('-e CODE', 'Execute CODE in parent process.',
-            'May be specified multiple times.') do |code|
-      settings[:code] << code
-    end
-
-    opts.separator ''
-    opts.on('-I DIRECTORY', 'Adds DIRECTORY to $LOAD_PATH.',
-            'May be specified multiple times.') do |dir|
-      settings[:extra_paths] << dir
-    end
-
-    opts.separator ''
-    opts.on('-r LIBRARY', 'Require LIBRARY in the parent process.',
-            'May be specified multiple times.') do |lib|
-      settings[:requires] << lib
-    end
-  end
-
-  def self.parse_client_args(args)
-    settings = Marshal.load Marshal.dump(DEFAULT_SETTINGS)
-
-    opts = OptionParser.new do |opts|
-      opts.banner = "Usage: #{$0} [options]\n#{USAGE_HELP}"
-
-      opts.separator ''
-      opts.on('-p', '--port PORT',
-              'Listen for connections on PORT.',
-              "Default: #{settings[:port]}") do |port|
-        settings[:port] = port.to_i
-              end
-
-      opts.separator ''
-      opts.on('-h', '--help', 'You\'re looking at it.') do
-        $stderr.puts opts
-        exit 1
-      end
-
-      add_env_args opts, settings
-    end
-
-    opts.parse! args
-
-    return settings
-  end
-
-  def self.parse_server_args(args)
-    settings = Marshal.load Marshal.dump(DEFAULT_SETTINGS)
-
-    opts = OptionParser.new do |opts|
-      opts.banner = "Usage: #{$0} [options]\n#{USAGE_HELP}"
-
-      opts.separator ''
-      opts.on('-p', '--port PORT',
-              'Listen for connections on PORT.',
-              "Default: #{settings[:port]}") do |port|
-        settings[:port] = port.to_i
-      end
-
-      opts.separator ''
-      opts.on('-h', '--help', 'You\'re looking at it.') do
-        $stderr.puts opts
-        exit 1
-      end
-
-      add_env_args opts, settings
-    end
-
-    opts.parse! args
-
-    return settings
-  end
-
-  def self.start_client(args = ARGV)
-    trap 'INT' do exit 1 end # Exit gracefully
-
-    settings = parse_client_args args
-
-    args = Marshal.dump [settings, ARGV]
-
-    socket = TCPSocket.new 'localhost', settings[:port]
-
-    socket.puts args.length
-    socket.write args
-    socket.close_write
-  end
-
-  def self.start_server(args = ARGV)
-    begin
-      require 'rubygems'
-    rescue LoadError
-    end
-    write_pwd
-    settings = parse_server_args args
-    setup_environment settings
-
-    server = TCPServer.new 'localhost', settings[:port]
-
-    $stderr.puts "#{$0} Running as PID #{$$} on #{settings[:port]}"
-
-    loop do
-      Thread.new server.accept do |socket|
-        begin
-          args_length = socket.gets.to_i
-          args = socket.read args_length
-          settings, argv = Marshal.load args
-          fork do
-            ARGV.replace argv
-            setup_environment settings
-            socket.close
-          end
-          socket.close # close my copy.
-        rescue => e
-          socket.close if socket
-        end
-      end
-    end
-  rescue Interrupt, SystemExit
-    File.unlink PWD_FILE
-  rescue Exception => e
-    File.unlink PWD_FILE
-    puts "Failed to catch #{e.class}:#{e.message}"
-    puts "\t#{e.backtrace.join "\n\t"}"
-  end
-
-  def self.setup_environment(settings)
-    settings[:extra_paths].map! { |dir| dir.split ':' }
-    settings[:extra_paths].flatten!
-    settings[:extra_paths].each { |dir| $:.unshift dir }
-
-    begin
-      settings[:requires].each { |file| require file }
-      settings[:code].each { |code| eval code, TOPLEVEL_BINDING }
-    rescue Exception
-      $@.reject! {|s| s =~ %r!rcodetools/fork\.rb!}
-      raise
-    end
-  end
-
-end
-
-end
-
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/lib/rcodetools/fork_config.rb b/bundles/ruby.tmbundle/Support/vendor/rcodetools/lib/rcodetools/fork_config.rb
deleted file mode 100644
index e22b4cd1f..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/lib/rcodetools/fork_config.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-
-module Rcodetools
-
-module Fork
-  PORT = 9085
-  # Contains $PWD of rct-fork server. Exists only while running.
-  PWD_FILE = File.expand_path "~/.rct-fork.pwd"
-
-  def self.chdir_fork_directory
-    if run?
-      Dir.chdir File.read(PWD_FILE)
-    else
-      raise "rct-fork is not running."
-    end
-  end
-
-  def self.write_pwd
-    open(PWD_FILE, "w"){|f| f.print Dir.pwd }
-  end
-
-  def self.run?
-    File.file? PWD_FILE
-  end
-end
-  
-end
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/lib/rcodetools/options.rb b/bundles/ruby.tmbundle/Support/vendor/rcodetools/lib/rcodetools/options.rb
deleted file mode 100644
index 8ba920986..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/lib/rcodetools/options.rb
+++ /dev/null
@@ -1,136 +0,0 @@
-require 'optparse'
-
-module Rcodetools
-# Domain specific OptionParser extensions
-module OptionHandler
-  def set_banner
-    self.banner = "Usage: #{$0} [options] [inputfile] [-- cmdline args]"
-  end
-
-  def handle_position(options)
-    separator ""
-    separator "Position options:"
-    on("--line=LINE", "Current line number.") do |n|
-      options[:lineno] = n.to_i
-    end
-    on("--column=COLUMN", "Current column number in BYTE.") do |n|
-      options[:column] = n.to_i
-    end
-    on("-t TEST", "--test=TEST",
-       "Execute test script. ",
-       "TEST is TESTSCRIPT, TESTSCRIPT@TESTMETHOD, or TESTSCRIPT@LINENO.",
-       "You must specify --filename option.") do |t|
-      options[:test_script], options[:test_method] = t.split(/@/)
-    end
-    on("--filename=FILENAME", "Filename of standard input.") do |f|
-      options[:filename] = f
-    end
-  end
-
-  def handle_interpreter(options)
-    separator ""
-    separator "Interpreter options:"
-    on("-S FILE", "--interpreter FILE", "Use interpreter FILE.") do |interpreter|
-      options[:interpreter] = interpreter
-    end
-    on("-I PATH", "Add PATH to $LOAD_PATH") do |path|
-      options[:include_paths] << path
-    end
-    on("--dev", "Add this project's bin/ and lib/ to $LOAD_PATH.",
-       "A directory with a Rakefile is considered a project base directory.") do
-      auto_include_paths(options[:include_paths], Dir.pwd)
-    end
-    on("-r LIB", "Require LIB before execution.") do |lib|
-      options[:libs] << lib
-    end
-    on("-e EXPR", "--eval=EXPR", "--stub=EXPR", "Evaluate EXPR after execution.") do |expr|
-      options[:evals] << expr
-    end
-    on("--fork", "Use rct-fork-client if rct-fork is running.") do 
-      options[:detect_rct_fork] = true
-    end
-    on("--rbtest", "Use rbtest.") do
-      options[:use_rbtest] = true
-    end
-    on("--detect-rbtest", "Use rbtest if '=begin test_*' blocks exist.") do
-      options[:detect_rbtest] = true
-    end
-  end
-
-  def handle_misc(options)
-    separator ""
-    separator "Misc options:"
-    on("--cd DIR", "Change working directory to DIR.") do |dir|
-      options[:wd] = dir
-    end
-    on("--debug", "Write transformed source code to xmp-tmp.PID.rb.") do
-      options[:dump] = "xmp-tmp.#{Process.pid}.rb"
-    end
-    on("--tmpfile", "--tempfile", "Use tmpfile instead of open3. (non-windows)") do
-      options[:execute_ruby_tmpfile] = true
-    end
-    on("-w N", "--width N", Integer, "Set width of multi-line annotation. (xmpfilter only)") do |width|
-      options[:width] = width
-    end
-    separator ""
-    on("-h", "--help", "Show this message") do
-      puts self
-      exit
-    end
-    on("-v", "--version", "Show version information") do
-      puts "#{File.basename($0)} #{XMPFilter::VERSION}"
-      exit
-    end
-  end
-
-  def auto_include_paths(include_paths, pwd)
-    if pwd =~ %r!^(.+)/(lib|bin)!
-      include_paths.unshift("#$1/lib").unshift("#$1/bin")
-    elsif File.file? "#{pwd}/Rakefile" or File.file? "#{pwd}/rakefile"
-      include_paths.unshift("#{pwd}/lib").unshift("#{pwd}/bin")
-    end
-  end
-  module_function :auto_include_paths
-
-end
-
-def set_extra_opts(options)
-  if idx = ARGV.index("--")
-    options[:options] = ARGV[idx+1..-1]
-    ARGV.replace ARGV[0...idx]
-  else
-    options[:options] = []
-  end
-end
-
-def check_opts(options)
-  if options[:test_script]
-    unless options[:filename]
-      $stderr.puts "You must specify --filename as well as -t(--test)."
-      exit 1
-    end
-  end
-end
-
-DEFAULT_OPTIONS = {
-  :interpreter       => "ruby",
-  :options => ["hoge"],
-  :min_codeline_size => 50,
-  :width             => 79,
-  :libs              => [],
-  :evals             => [],
-  :include_paths     => [],
-  :dump              => nil,
-  :wd                => nil,
-  :warnings          => true,
-  :use_parentheses   => true,
-  :column            => nil,
-  :output_stdout     => true,
-  :test_script       => nil,
-  :test_method       => nil,
-  :detect_rct_fork   => false,
-  :use_rbtest        => false,
-  :detect_rbtest     => false,
-  :execute_ruby_tmpfile => false,
-  }
-end                             # /Rcodetools
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/lib/rcodetools/xmpfilter.rb b/bundles/ruby.tmbundle/Support/vendor/rcodetools/lib/rcodetools/xmpfilter.rb
deleted file mode 100755
index a174b5180..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/lib/rcodetools/xmpfilter.rb
+++ /dev/null
@@ -1,379 +0,0 @@
-#!/usr/bin/env ruby
-# Copyright (c) 2005-2008 Mauricio Fernandez <mfp@acm.org> http://eigenclass.org
-#                         rubikitch <rubikitch@ruby-lang.org>
-# Use and distribution subject to the terms of the Ruby license.
-
-# This is needed regexps cannot match with invalid-encoding strings.
-# xmpfilter is unaware of script encoding.
-Encoding.default_external = "ASCII-8BIT" if RUBY_VERSION >= "1.9"
-
-ENV['HOME'] ||= "#{ENV['HOMEDRIVE']}#{ENV['HOMEPATH']}"
-require 'rcodetools/fork_config'
-require 'rcodetools/compat'
-require 'tmpdir'
-
-module Rcodetools
-
-class XMPFilter
-  VERSION = "0.8.7"
-
-  MARKER = "!XMP#{Time.new.to_i}_#{Process.pid}_#{rand(1000000)}!"
-  XMP_RE = Regexp.new("^" + Regexp.escape(MARKER) + '\[([0-9]+)\] (=>|~>|==>) (.*)')
-  VAR = "_xmp_#{Time.new.to_i}_#{Process.pid}_#{rand(1000000)}"
-  WARNING_RE = /.*:([0-9]+): warning: (.*)/
-
-  RuntimeData = Struct.new(:results, :exceptions, :bindings)
-
-  INITIALIZE_OPTS = {:interpreter => "ruby", :options => [], :libs => [],
-                     :include_paths => [], :warnings => true, 
-                     :use_parentheses => true}
-
-  def windows?
-    /win|mingw/ =~ RUBY_PLATFORM && /darwin/ !~ RUBY_PLATFORM
-  end
-
-  Interpreter = Struct.new(:options, :execute_method, :accept_debug, :accept_include_paths, :chdir_proc)
-  INTERPRETER_RUBY = Interpreter.new(["-w"],
-    :execute_ruby, true, true, nil)
-  INTERPRETER_RBTEST = Interpreter.new(["-S", "rbtest"],
-    :execute_script, false, false, nil)
-  INTERPRETER_FORK = Interpreter.new(["-S", "rct-fork-client"],
-    :execute_tmpfile, false, true,
-    lambda { Fork::chdir_fork_directory })
-                                     
-  def self.detect_rbtest(code, opts)
-    opts[:use_rbtest] ||= (opts[:detect_rbtest] and code =~ /^=begin test./) ? true : false
-  end
-
-  # The processor (overridable)
-  def self.run(code, opts)
-    new(opts).annotate(code)
-  end
-
-  def initialize(opts = {})
-    options = INITIALIZE_OPTS.merge opts
-    @interpreter_info = INTERPRETER_RUBY
-    @interpreter = options[:interpreter]
-    @options = options[:options]
-    @libs = options[:libs]
-    @evals = options[:evals] || []
-    @include_paths = options[:include_paths]
-    @output_stdout = options[:output_stdout]
-    @dump = options[:dump]
-    @warnings = options[:warnings]
-    @parentheses = options[:use_parentheses]
-    @ignore_NoMethodError = options[:ignore_NoMethodError]
-    test_script = options[:test_script]
-    test_method = options[:test_method]
-    filename = options[:filename]
-    @execute_ruby_tmpfile = options[:execute_ruby_tmpfile]
-    @postfix = ""
-    @stdin_path = nil
-    @width = options[:width]
-    
-    initialize_rct_fork if options[:detect_rct_fork]
-    initialize_rbtest if options[:use_rbtest]
-    initialize_for_test_script test_script, test_method, filename if test_script and !options[:use_rbtest]
-  end
-
-  def initialize_rct_fork
-    if Fork::run?
-      @interpreter_info = INTERPRETER_FORK
-    end
-  end
-
-  def initialize_rbtest
-    @interpreter_info = INTERPRETER_RBTEST
-  end
-
-  def initialize_for_test_script(test_script, test_method, filename)
-    test_script.replace File.expand_path(test_script)
-    filename.replace File.expand_path(filename)
-    unless test_script == filename
-      basedir = common_path(test_script, filename)
-      relative_filename = filename[basedir.length+1 .. -1].sub(%r!^lib/!, '')
-      @evals << %Q!$LOADED_FEATURES << #{relative_filename.dump}!
-      @evals << safe_require_code('test/unit')
-      @evals << %Q!load #{test_script.dump}!
-    end
-    test_method = get_test_method_from_lineno(test_script, test_method.to_i) if test_method =~ /^\d/
-    @evals << %Q!Test::Unit::AutoRunner.run(false, nil, ["-n", #{test_method.dump}])! if test_method
-  end
-
-  def get_test_method_from_lineno(filename, lineno)
-    lines = File.readlines(filename)
-    (lineno-1).downto(0) do |i|
-      if lines[i] =~ /^ *def *(test_[A-Za-z0-9?!_]+)$/
-        return $1
-      end
-    end
-    nil
-  end
-
-  def common_path(a, b)
-    (a.split(File::Separator) & b.split(File::Separator)).join(File::Separator)
-  end
-
-  def add_markers(code, min_codeline_size = 50)
-    maxlen = code.map{|x| x.size}.max
-    maxlen = [min_codeline_size, maxlen + 2].max
-    ret = ""
-    code.each do |l|
-      l = l.chomp.gsub(/ # (=>|!>).*/, "").gsub(/\s*$/, "")
-      ret << (l + " " * (maxlen - l.size) + " # =>\n")
-    end
-    ret
-  end
-
-  SINGLE_LINE_RE = /^(?!(?:\s+|(?:\s*#.+)?)# ?=>)(.*) # ?=>.*/
-  MULTI_LINE_RE = /^(.*)\n(( *)# ?=>.*(?:\n|\z))(?: *#    .*\n)*/
-  def annotate(code)
-    idx = 0
-    code = code.gsub(/ # !>.*/, '')
-    newcode = code.gsub(SINGLE_LINE_RE){ prepare_line($1, idx += 1) }
-    newcode.gsub!(MULTI_LINE_RE){ prepare_line($1, idx += 1, true)}
-    File.open(@dump, "w"){|f| f.puts newcode} if @dump
-    execute(newcode) do |stdout, stderr|
-      output = stderr.readlines
-      runtime_data = extract_data(output)
-      idx = 0
-      annotated = code.gsub(SINGLE_LINE_RE) { |l|
-        expr = $1
-        if /^\s*#/ =~ l
-          l 
-        else
-          annotated_line(l, expr, runtime_data, idx += 1)
-        end
-      }
-      annotated.gsub!(/ # !>.*/, '')
-      annotated.gsub!(/# (>>|~>)[^\n]*\n/m, "");
-      annotated.gsub!(MULTI_LINE_RE) { |l|
-        annotated_multi_line(l, $1, $3, runtime_data, idx += 1)
-      }
-      ret = final_decoration(annotated, output)
-      if @output_stdout and (s = stdout.read) != ""
-        ret << s.inject(""){|s,line| s + "# >> #{line}".chomp + "\n" }
-      end
-      ret
-    end
-  end
-
-  def annotated_line(line, expression, runtime_data, idx)
-    "#{expression} # => " + (runtime_data.results[idx].map{|x| x[1]} || []).join(", ")
-  end
-  
-  def annotated_multi_line(line, expression, indent, runtime_data, idx)
-    pretty = (runtime_data.results[idx].map{|x| x[1]} || []).join(", ")
-    first, *rest = pretty.to_a
-    rest.inject("#{expression}\n#{indent}# => #{first || "\n"}") {|s, l| s << "#{indent}#    " << l }
-  end
-  
-  def prepare_line_annotation(expr, idx, multi_line=false)
-    v = "#{VAR}"
-    blocal = "__#{VAR}"
-    blocal2 = "___#{VAR}"
-    lastmatch = "____#{VAR}"
-    if multi_line
-      pp = safe_require_code "pp"
-      result = "((begin; #{lastmatch} = $~; PP.pp(#{v}, '', #{@width-5}).gsub(/\\r?\\n/, 'PPPROTECT'); ensure; $~ = #{lastmatch} end))"
-    else
-      pp = ''
-      result = "#{v}.inspect"
-    end
-    oneline_ize(<<-EOF).chomp
-#{pp}
-#{v} = (#{expr})
-$stderr.puts("#{MARKER}[#{idx}] => " + #{v}.class.to_s + " " + #{result}) || begin
-  $stderr.puts local_variables
-  local_variables.each{|#{blocal}|
-    #{blocal2} = eval(#{blocal})
-    if #{v} == #{blocal2} && #{blocal} != %#{expr}.strip
-      $stderr.puts("#{MARKER}[#{idx}] ==> " + #{blocal})
-    elsif [#{blocal2}] == #{v}
-      $stderr.puts("#{MARKER}[#{idx}] ==> [" + #{blocal} + "]")
-    end
-  }
-  nil
-rescue Exception
-  nil
-end || #{v}
-    EOF
-
-  end
-  alias_method :prepare_line, :prepare_line_annotation
-
-  def safe_require_code(lib)
-    oldverbose = "$#{VAR}_old_verbose"
-    "#{oldverbose} = $VERBOSE; $VERBOSE = false; require '#{lib}'; $VERBOSE = #{oldverbose}"
-  end
-  private :safe_require_code
-
-  def execute_ruby(code)
-    meth = (windows? or @execute_ruby_tmpfile) ? :execute_tmpfile : :execute_popen
-    __send__ meth, code
-  end
-
-  def split_shbang(script)
-    ary = script.each_line.to_a
-    if ary[0] =~ /^#!/ and ary[1] =~ /^#.*coding/
-      [ary[0..1], ary[2..-1]]
-    elsif ary[0] =~ /^#!|^#.*coding/ 
-      [[ary[0]], ary[1..-1]]
-    else
-      [[], ary]
-    end
-  end
-  private :split_shbang
-
-  def execute_tmpfile(code)
-    ios = %w[_ stdin stdout stderr]
-    stdin, stdout, stderr = (1..3).map do |i|
-      fname = if $DEBUG
-                "xmpfilter.tmpfile_#{ios[i]}.rb"
-              else
-                "xmpfilter.tmpfile_#{Process.pid}-#{i}.rb"
-              end
-      f = File.open(fname, "w+")
-      f
-    end
-    # stdin.puts code
-    # stdin.close
-    shbang_magic_comment, rest = split_shbang(code)
-    @stdin_path = File.expand_path stdin.path
-    stdin.print shbang_magic_comment
-    stdin.print <<-EOF.map{|l| l.strip}.join(";")
-      $stdout.reopen('#{File.expand_path(stdout.path)}', 'w')
-      $stderr.reopen('#{File.expand_path(stderr.path)}', 'w')
-      $0 = '#{File.expand_path(stdin.path)}'
-      ARGV.replace(#{@options.inspect})
-      END { #{@evals.join(";")} }
-    EOF
-    stdin.print ";#{rest}"
-    
-    debugprint "execute command = #{(interpreter_command << stdin.path).join ' '}"
-    stdin.close
-    oldpwd = Dir.pwd
-    @interpreter_info.chdir_proc and @interpreter_info.chdir_proc.call
-    system(*(interpreter_command << stdin.path))
-    Dir.chdir oldpwd
-    [stdout, stderr]
-  end
-
-  def execute_popen(code)
-    require 'open3'
-    stdin, stdout, stderr = Open3::popen3(*interpreter_command)
-    stdin.puts code
-    @evals.each{|x| stdin.puts x } unless @evals.empty?
-    stdin.close
-    [stdout, stderr]
-  end
-
-  def execute_script(code)
-    path = File.expand_path("xmpfilter.tmpfile_#{Process.pid}.rb", Dir.tmpdir)
-    File.open(path, "w"){|f| f.puts code}
-    at_exit { File.unlink path if File.exist? path}
-    stdout_path, stderr_path = (1..2).map do |i|
-      fname = "xmpfilter.tmpfile_#{Process.pid}-#{i}.rb"
-      File.expand_path(fname, Dir.tmpdir)
-    end
-    args = *(interpreter_command << %["#{path}"] << "2>" << 
-      %["#{stderr_path}"] << ">" << %["#{stdout_path}"])
-    system(args.join(" "))
-    
-    [stdout_path, stderr_path].map do |fullname|
-      f = File.open(fullname, "r")
-      # at_exit {
-      #   f.close unless f.closed?
-      #   File.unlink fullname if File.exist? fullname
-      # }
-      f
-    end
-  end
-
-  def execute(code)
-    stdout, stderr = __send__ @interpreter_info.execute_method, code
-    if block_given?
-      begin
-        yield stdout, stderr
-      ensure
-        for out in [stdout, stderr]
-          path = out.path rescue nil
-          out.close
-#          File.unlink path if path
-        end
-      end
-    else
-      [stdout, stderr]
-    end
-  end
-
-  def interpreter_command
-    # BUG interpreter option arguments containing space are not
-    # accepted. But it seems to be rare case.
-    r = @interpreter.split + @interpreter_info.options
-    r << "-d" if $DEBUG and @interpreter_info.accept_debug
-    r << "-I#{@include_paths.join(":")}" if @interpreter_info.accept_include_paths and !@include_paths.empty?
-    @libs.each{|x| r << "-r#{x}" } unless @libs.empty?
-    (r << "-").concat @options unless @options.empty?
-    r
-  end
-
-  def extract_data(output)
-    results = Hash.new{|h,k| h[k] = []}
-    exceptions = Hash.new{|h,k| h[k] = []}
-    bindings = Hash.new{|h,k| h[k] = []}
-    output.grep(XMP_RE).each do |line|
-      result_id, op, result = XMP_RE.match(line).captures
-      case op
-      when "=>"
-        klass, value = /(\S+)\s+(.*)/.match(result).captures
-        results[result_id.to_i] << [klass, value.gsub(/PPPROTECT/, "\n")]
-      when "~>"
-        exceptions[result_id.to_i] << result
-      when "==>"
-        bindings[result_id.to_i] << result unless result.index(VAR) 
-      end
-    end
-    RuntimeData.new(results, exceptions, bindings)
-  end
-
-  def final_decoration(code, output)
-    warnings = {}
-    output.join.grep(WARNING_RE).map do |x|
-      md = WARNING_RE.match(x)
-      warnings[md[1].to_i] = md[2]
-    end
-    idx = 0
-    ret = code.map do |line|
-      w = warnings[idx+=1]
-      if @warnings
-        w ? (line.chomp + " # !> #{w}") : line
-      else
-        line
-      end
-    end
-    output = output.reject{|x| /^-:[0-9]+: warning/.match(x)}
-    if exception = /^-e?:[0-9]+:.*|^(?!!XMP)[^\n]+:[0-9]+:in .*/m.match(output.join)
-      err = exception[0]
-      err.gsub!(Regexp.union(@stdin_path), '-') if @stdin_path
-      ret << err.map{|line| "# ~> " + line }
-    end
-    ret
-  end
-
-  def oneline_ize(code)
-    "((" + code.gsub(/\r?\n|\r/, ';') + "));#{@postfix}\n"
-  end
-
-  def debugprint(*args)
-    $stderr.puts(*args) if $DEBUG
-  end
-end # clas XMPFilter
-
-class XMPAddMarkers < XMPFilter
-  def self.run(code, opts)
-    new(opts).add_markers(code, opts[:min_codeline_size])
-  end
-end
-
-end
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/lib/rcodetools/xmptestunitfilter.rb b/bundles/ruby.tmbundle/Support/vendor/rcodetools/lib/rcodetools/xmptestunitfilter.rb
deleted file mode 100644
index e3fe395f2..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/lib/rcodetools/xmptestunitfilter.rb
+++ /dev/null
@@ -1,314 +0,0 @@
-require 'rcodetools/xmpfilter'
-
-module Rcodetools
-
-FLOAT_TOLERANCE = 0.0001
-class XMPTestUnitFilter < XMPFilter
-  def initialize(opts = {})
-    super
-    @output_stdout = false
-    mod = @parentheses ? :WithParentheses : :Poetry
-    extend self.class.const_get(mod) unless opts[:_no_extend_module]
-  end
-
-  private
-  def annotated_line(line, expression, runtime_data, idx)
-    indent =  /^\s*/.match(line)[0]
-    assertions(expression.strip, runtime_data, idx).map{|x| indent + x}.join("\n")
-  end
-
-  def prepare_line(expr, idx)
-    basic_eval = prepare_line_annotation(expr, idx)
-    %|begin; #{basic_eval}; rescue Exception; $stderr.puts("#{MARKER}[#{idx}] ~> " + $!.class.to_s); end|
-  end
-
-  def assertions(expression, runtime_data, index)
-    exceptions = runtime_data.exceptions
-    ret = []
-
-    unless (vars = runtime_data.bindings[index]).empty?
-      vars.each{|var| ret << equal_assertion(var, expression) }
-    end
-    if !(wanted = runtime_data.results[index]).empty? || !exceptions[index]
-      case (wanted[0][1] rescue 1)
-      when "nil"
-        ret.concat nil_assertion(expression)
-      else
-        case wanted.size
-        when 1
-          ret.concat _value_assertions(wanted[0], expression)
-        else
-          # discard values from multiple runs
-          ret.concat(["#xmpfilter: WARNING!! extra values ignored"] + 
-                     _value_assertions(wanted[0], expression))
-        end
-      end
-    else
-      ret.concat raise_assertion(expression, exceptions, index)
-    end
-
-    ret
-  end
-
-  OTHER = Class.new
-  def _value_assertions(klass_value_txt_pair, expression)
-    klass_txt, value_txt = klass_value_txt_pair
-    value = eval(value_txt) || OTHER.new
-    # special cases
-    value = nil if value_txt.strip == "nil"
-    value = false if value_txt.strip == "false"
-    value_assertions klass_txt, value_txt, value, expression
-  rescue Exception
-    return object_assertions(klass_txt, value_txt, expression)
-  end
-
-  def raise_assertion(expression, exceptions, index)
-    ["assert_raise(#{exceptions[index][0]}){#{expression}}"]
-  end
-
-  module WithParentheses
-    def nil_assertion(expression)
-      ["assert_nil(#{expression})"]
-    end
-
-    def value_assertions(klass_txt, value_txt, value, expression)
-      case value
-      when Float
-        ["assert_in_delta(#{value.inspect}, #{expression}, #{FLOAT_TOLERANCE})"]
-      when Numeric, String, Hash, Array, Regexp, TrueClass, FalseClass, Symbol, NilClass
-        ["assert_equal(#{value_txt}, #{expression})"]
-      else
-        object_assertions(klass_txt, value_txt, expression)
-      end
-    end
-
-    def object_assertions(klass_txt, value_txt, expression)
-      [ "assert_kind_of(#{klass_txt}, #{expression})",
-        "assert_equal(#{value_txt.inspect}, #{expression}.inspect)" ]
-    end
-
-    def equal_assertion(expected, actual)
-      "assert_equal(#{expected}, #{actual})"
-    end
-  end
-
-  module Poetry
-    def nil_assertion(expression)
-      ["assert_nil #{expression}"]
-    end
-
-    def value_assertions(klass_txt, value_txt, value, expression)
-      case value
-      when Float
-        ["assert_in_delta #{value.inspect}, #{expression}, #{FLOAT_TOLERANCE}"]
-      when Numeric, String, Hash, Array, Regexp, TrueClass, FalseClass, Symbol, NilClass
-        ["assert_equal #{value_txt}, #{expression}"]
-      else
-        object_assertions klass_txt, value_txt, expression
-      end
-    end
-
-    def object_assertions(klass_txt, value_txt, expression)
-      [ "assert_kind_of #{klass_txt}, #{expression} ",
-        "assert_equal #{value_txt.inspect}, #{expression}.inspect" ] 
-    end
-
-    def equal_assertion(expected, actual)
-      "assert_equal #{expected}, #{actual}"
-    end
-  end
-end
-
-class XMPRSpecFilter < XMPTestUnitFilter
-  def initialize(x={})
-    super(x.merge(:_no_extend_module => true))
-    load_rspec
-    specver = (Spec::VERSION::STRING rescue "1.0.0")
-    api_module = specver >= "0.8.0" ? NewAPI : OldAPI
-    @interpreter_info.execute_method = :execute_script
-    mod = @parentheses ? :WithParentheses : :Poetry
-    extend api_module.const_get(mod) 
-    extend api_module
-  end
-
-  private
-  def load_rspec
-    begin
-      require 'spec/version'
-    rescue LoadError
-      require 'rubygems'
-      begin
-        require 'spec/version'
-      rescue LoadError # if rspec isn't available, use most recent conventions
-      end
-    end
-  end
-
-#  alias :execute :execute_script
-
-  def interpreter_command
-    [@interpreter] + @libs.map{|x| "-r#{x}"}
-  end
-
-  module NewAPI
-    def raise_assertion(expression, exceptions, index)
-      ["lambda{#{expression}}.should raise_error(#{exceptions[index][0]})"]
-    end
-
-    module WithParentheses
-      def nil_assertion(expression)
-        ["(#{expression}).should be_nil"]
-      end
-
-      def value_assertions(klass_txt, value_txt, value, expression)
-        case value
-        when Float
-          ["(#{expression}).should be_close(#{value.inspect}, #{FLOAT_TOLERANCE})"]
-        when Numeric, String, Hash, Array, Regexp, TrueClass, FalseClass, Symbol, NilClass
-          ["(#{expression}).should == (#{value_txt})"]
-        else
-          object_assertions klass_txt, value_txt, expression
-        end
-      end
-
-      def object_assertions(klass_txt, value_txt, expression)
-        [ "(#{expression}).should be_a_kind_of(#{klass_txt})",
-          "(#{expression}.inspect).should == (#{value_txt.inspect})" ]
-      end
-
-      def equal_assertion(expected, actual)
-        "(#{actual}).should == (#{expected})"
-      end
-    end
-
-    module Poetry
-      def nil_assertion(expression)
-        ["#{expression}.should be_nil"]
-      end
-
-      def value_assertions(klass_txt, value_txt, value, expression)
-        case value
-        when Float
-          ["#{expression}.should be_close(#{value.inspect}, #{FLOAT_TOLERANCE})"]
-        when Numeric, String, Hash, Array, Regexp, TrueClass, FalseClass, Symbol, NilClass
-          ["#{expression}.should == #{value_txt}"]
-        else
-          object_assertions klass_txt, value_txt, expression
-        end
-      end
-
-      def object_assertions(klass_txt, value_txt, expression)
-        [ "#{expression}.should be_a_kind_of(#{klass_txt})",
-          "#{expression}.inspect.should == #{value_txt.inspect}" ]
-      end
-
-      def equal_assertion(expected, actual)
-        "#{actual}.should == #{expected}"
-      end
-    end
-  end
-
-  module OldAPI
-    # old rspec, use deprecated syntax
-    def raise_assertion(expression, exceptions, index)
-      ["lambda{#{expression}}.should_raise_error(#{exceptions[index][0]})"]
-    end
-
-    module WithParentheses
-      def nil_assertion(expression)
-        ["(#{expression}).should_be_nil"]
-      end
-
-      def value_assertions(klass_txt, value_txt, value, expression)
-        case value
-        when Float
-          ["(#{expression}).should_be_close(#{value.inspect}, #{FLOAT_TOLERANCE})"]
-        when Numeric, String, Hash, Array, Regexp, TrueClass, FalseClass, Symbol, NilClass
-          ["(#{expression}).should_equal(#{value_txt})"]
-        else
-          object_assertions klass_txt, value_txt, expression
-        end
-      end
-
-      def object_assertions(klass_txt, value_txt, expression)
-        [ "(#{expression}).should_be_a_kind_of(#{klass_txt})",
-          "(#{expression}.inspect).should_equal(#{value_txt.inspect})" ]
-      end
-
-      def equal_assertion(expected, actual)
-        "(#{actual}).should_equal(#{expected})"
-      end
-    end
-
-    module Poetry
-      def nil_assertion(expression)
-        ["#{expression}.should_be_nil"]
-      end
-
-      def value_assertions(klass_txt, value_txt, value, expression)
-        case value
-        when Float
-          ["#{expression}.should_be_close #{value.inspect}, #{FLOAT_TOLERANCE}"]
-        when Numeric, String, Hash, Array, Regexp, TrueClass, FalseClass, Symbol, NilClass
-          ["#{expression}.should_equal #{value_txt}"]
-        else
-          object_assertions klass_txt, value_txt, expression
-        end
-      end
-
-      def object_assertions(klass_txt, value_txt, expression)
-        [ "#{expression}.should_be_a_kind_of #{klass_txt}",
-          "#{expression}.inspect.should_equal #{value_txt.inspect}" ]
-      end
-
-      def equal_assertion(expected, actual)
-        "#{actual}.should_equal #{expected}"
-      end
-    end
-  end
-
-
-end
-
-class XMPExpectationsFilter < XMPTestUnitFilter
-  def initialize(x={})
-    super(x.merge(:_no_extend_module => true))
-    @warnings = false
-  end
-  
-  def expectation(expected, actual)
-    <<EOE
-expect #{expected} do
-    #{actual}
-  end
-EOE
-  end
-  alias :equal_assertion :expectation
-
-  def raise_assertion(expression, exceptions, index)
-    [ expectation(exceptions[index][0], expression) ]
-  end
-  
-  def nil_assertion(expression)
-    [ expectation("nil", expression) ]
-  end
-  
-  def value_assertions(klass_txt, value_txt, value, expression)
-    case value
-    when Float
-      min = "%.4f" % [value - FLOAT_TOLERANCE]
-      max = "%.4f" % [value + FLOAT_TOLERANCE]
-      [ expectation("#{min}..#{max}", expression) ]
-    when Numeric, String, Hash, Array, Regexp, TrueClass, FalseClass, Symbol, NilClass
-      [ expectation(value_txt, expression) ]
-    else
-      object_assertions klass_txt, value_txt, expression 
-    end
-  end
-  
-  def object_assertions(klass_txt, value_txt, expression)
-    [ expectation(klass_txt, expression),
-      expectation(value_txt.inspect, "#{expression}.inspect") ]
-  end
-end                             # /XMPExpectationsFilter
-end                             # /Rcodetools
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/lib/ruby_toggle_file.rb b/bundles/ruby.tmbundle/Support/vendor/rcodetools/lib/ruby_toggle_file.rb
deleted file mode 100644
index 18ee70693..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/lib/ruby_toggle_file.rb
+++ /dev/null
@@ -1,99 +0,0 @@
-
-# The name is taken from EmacsLisp
-def run_hooks_with_args_until_success(regexp, *args)
-  private_methods(true).concat(methods(true)).grep(regexp).sort.each do |m|
-    _ = __send__(m, *args)
-    return _ if _
-  end
-  nil
-end
-
-class RubyToggleFile
-  def ruby_toggle_file(file)
-    if File.basename(file) =~ /(?:^test_|_test\.rb$)/
-      implementation_file(file)
-    else
-      test_file(file)
-    end
-  end
-
-  LIB_RE = %r!/lib/(.+)\.rb$!
-  TEST_RE = %r!/test/(.+/)?test_(.+)\.rb$!
-
-  def test_file(implementation)
-    if m = LIB_RE.match(implementation)
-      dir, node = File.split m[1]
-      dir = (dir == '.') ? nil : dir+"/"
-    else
-      dir = node = nil
-    end
-    run_hooks_with_args_until_success %r/^test_file_/, implementation, m&&(m.pre_match+"/"), dir, node
-  end
-
-  def implementation_file(test)
-    m = TEST_RE.match(test)
-    run_hooks_with_args_until_success %r/^implementation_file_/, test, m&&(m.pre_match+"/"), m&&m[1], m&&m[2]
-  end
-
-#  private
-  def exist(file)
-    file if File.exist? file
-  end
-
-  RAILS_MVC2TESTNAME = { 'models' => 'unit', 'controllers' => 'functional' }
-  RAILS_TESTNAME2MVC = RAILS_MVC2TESTNAME.invert
-  def test_file_00_rails(implementation, basedir, dir, node) # rails
-    if m = %r!app/(models|controllers)/(.+)\.rb$!.match(implementation)
-      "%stest/%s/%s_test.rb" % [ m.pre_match, RAILS_MVC2TESTNAME[m[1]], m[2] ]
-    end
-  end
-
-  def test_file_05_rails_lib(implementation, basedir, dir, node)
-    if basedir and File.directory?( File.join(basedir, "app") )
-      "#{basedir}test/unit/test_#{node}.rb"
-    end
-  end
-
-  def test_file_10_no_match(implementation, basedir, dir, node)
-    if [basedir, dir, node].all?{|x| x.nil?}
-      "#{File.dirname(implementation)}/test_#{File.basename(implementation)}"
-    end
-  end
-
-  def test_file_20_simple(implementation, basedir, dir, node) # test/test_NODE.rb
-    exist "#{basedir}test/test_#{node}.rb"
-  end
-
-  def test_file_30_flat(implementation, basedir, dir, node) # lib/XXX/NODE.rb -> test/test_NODE.rb
-    exist "#{basedir}test/test_#{node}.rb" if dir
-  end
-
-  def test_file_99_autotest_default(implementation, basedir, dir, node) # lib/XXX/NODE.rb -> test/XXX/test_NODE.rb
-    "#{basedir}test/#{dir}test_#{node}.rb"
-  end
-
-  def implementation_file_00_rails(test, basedir, dir, node)
-    if m = %r!test/(unit|functional)/(.+)_test.rb$!.match(test)
-      "%sapp/%s/%s.rb" % [ m.pre_match, RAILS_TESTNAME2MVC[m[1]], m[2] ]
-    end
-  end
-
-  def implementation_file_10_no_match(test, basename, dir, node)
-    if dir == nil and node == nil and test =~ %r!/test_(.+)\.rb$!
-      test.sub("/test_", "/")
-    end
-  end
-
-  def implementation_file_20(test, basedir, dir, node)
-    exist("#{basedir}lib/#{dir}#{node}.rb")
-  end
-
-  def implementation_file_30_flat(test, basedir, dir, node)
-    Dir[ "#{basedir}lib/**/#{node}.rb" ].first
-  end
-
-  def implementation_file_99_default(test, basedir, dir, node)
-    "#{basedir}lib/#{dir}#{node}.rb"
-  end
-
-end
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/license.txt b/bundles/ruby.tmbundle/Support/vendor/rcodetools/license.txt
deleted file mode 100644
index e2eb45cde..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/license.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-
- rcodetools  http://eigenclass.org/hiki.rb?rcodetools
- Copyright (c) 2005-2007 Mauricio Fernandez <mfp@acm.org> http://eigenclass.org
- Copyright (c) 2006-2008 rubikitch <rubikitch@ruby-lang.org> http://www.rubyist.net/~rubikitch/
-Use and distribution subject to the terms of the Ruby license.
-
-= License
-rcodetools is licensed under the same terms as Ruby.
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/rcodetools.el b/bundles/ruby.tmbundle/Support/vendor/rcodetools/rcodetools.el
deleted file mode 100644
index e5c90af96..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/rcodetools.el
+++ /dev/null
@@ -1,430 +0,0 @@
-;;; rcodetools.el -- annotation / accurate completion / browsing documentation
-
-;;; Copyright (c) 2006-2008 rubikitch <rubikitch@ruby-lang.org>
-;;;
-;;; Use and distribution subject to the terms of the Ruby license.
-
-(defvar xmpfilter-command-name "ruby -S xmpfilter --dev --fork --detect-rbtest"
-  "The xmpfilter command name.")
-(defvar rct-doc-command-name "ruby -S rct-doc --dev --fork --detect-rbtest"
-  "The rct-doc command name.")
-(defvar rct-complete-command-name "ruby -S rct-complete --dev --fork --detect-rbtest"
-  "The rct-complete command name.")
-(defvar ruby-toggle-file-command-name "ruby -S ruby-toggle-file"
-  "The ruby-toggle-file command name.")
-(defvar rct-fork-command-name "ruby -S rct-fork")
-(defvar rct-option-history nil)                ;internal
-(defvar rct-option-local nil)     ;internal
-(make-variable-buffer-local 'rct-option-local)
-(defvar rct-debug nil
-  "If non-nil, output debug message into *Messages*.")
-;; (setq rct-debug t)
-
-(defadvice comment-dwim (around rct-hack activate)
-  "If comment-dwim is successively called, add => mark."
-  (if (and (eq major-mode 'ruby-mode)
-           (eq last-command 'comment-dwim)
-           ;; TODO =>check
-           )
-      (insert "=>")
-    ad-do-it))
-;; To remove this advice.
-;; (progn (ad-disable-advice 'comment-dwim 'around 'rct-hack) (ad-update 'comment-dwim)) 
-
-(defun rct-current-line ()
-  "Return the vertical position of point..."
-  (+ (count-lines (point-min) (point))
-     (if (= (current-column) 0) 1 0)))
-
-(defun rct-save-position (proc)
-  "Evaluate proc with saving current-line/current-column/window-start."
-  (let ((line (rct-current-line))
-        (col  (current-column))
-        (wstart (window-start)))
-    (funcall proc)
-    (goto-char (point-min))
-    (forward-line (1- line))
-    (move-to-column col)
-    (set-window-start (selected-window) wstart)))
-
-(defun rct-interactive ()
-  "All the rcodetools-related commands with prefix args read rcodetools' common option. And store option into buffer-local variable."
-  (list
-   (let ((option (or rct-option-local "")))
-     (if current-prefix-arg
-         (setq rct-option-local
-               (read-from-minibuffer "rcodetools option: " option nil nil 'rct-option-history))
-       option))))  
-
-(defun rct-shell-command (command &optional buffer)
-  "Replacement for `(shell-command-on-region (point-min) (point-max) command buffer t' because of encoding problem."
-  (let ((input-rb (concat (make-temp-name "xmptmp-in") ".rb"))
-        (output-rb (concat (make-temp-name "xmptmp-out") ".rb"))
-        (coding-system-for-read buffer-file-coding-system))
-    (write-region (point-min) (point-max) input-rb nil 'nodisp)
-    (shell-command
-     (rct-debuglog (format "%s %s > %s" command input-rb output-rb))
-     t " *rct-error*")
-    (with-current-buffer (or buffer (current-buffer))
-      (insert-file-contents output-rb nil nil nil t))
-    (delete-file input-rb)
-    (delete-file output-rb)))
-
-(defvar xmpfilter-command-function 'xmpfilter-command)
-(defun xmp (&optional option)
-  "Run xmpfilter for annotation/test/spec on whole buffer.
-See also `rct-interactive'. "
-  (interactive (rct-interactive))
-  (rct-save-position
-   (lambda ()
-     (rct-shell-command (funcall xmpfilter-command-function option)))))
-
-(defun xmpfilter-command (&optional option)
-  "The xmpfilter command line, DWIM."
-  (setq option (or option ""))
-  (flet ((in-block (beg-re)
-                   (save-excursion
-                     (goto-char (point-min))
-                     (when (re-search-forward beg-re nil t)
-                       (let ((s (point)) e)
-                         (when (re-search-forward "^end\n" nil t)
-                           (setq e (point))
-                           (goto-char s)
-                           (re-search-forward "# => *$" e t)))))))
-    (cond ((in-block "^class.+< Test::Unit::TestCase$")
-           (format "%s --unittest %s" xmpfilter-command-name option))
-          ((in-block "^\\(describe\\|context\\).+do$")
-           (format "%s --spec %s" xmpfilter-command-name option))
-          (t
-           (format "%s %s" xmpfilter-command-name option)))))
-
-;;;; Completion
-(defvar rct-method-completion-table nil) ;internal
-(defvar rct-complete-symbol-function 'rct-complete-symbol--normal
-  "Function to use rct-complete-symbol.")
-;; (setq rct-complete-symbol-function 'rct-complete-symbol--icicles)
-(defvar rct-use-test-script t
-  "Whether rct-complete/rct-doc use test scripts.")
-
-(defun rct-complete-symbol (&optional option)
-  "Perform ruby method and class completion on the text around point.
-This command only calls a function according to `rct-complete-symbol-function'.
-See also `rct-interactive', `rct-complete-symbol--normal', and `rct-complete-symbol--icicles'."
-  (interactive (rct-interactive))
-  (call-interactively rct-complete-symbol-function))
-
-(defun rct-complete-symbol--normal (&optional option)
-  "Perform ruby method and class completion on the text around point.
-See also `rct-interactive'."
-  (interactive (rct-interactive))
-  (let ((end (point)) beg
-	pattern alist
-	completion)
-    (setq completion (rct-try-completion)) ; set also pattern / completion
-    (save-excursion
-      (search-backward pattern)
-      (setq beg (point)))
-    (cond ((eq completion t)            ;sole completion
-           (message "%s" "Sole completion"))
-	  ((null completion)            ;no completions
-	   (message "Can't find completion for \"%s\"" pattern)
-	   (ding))
-	  ((not (string= pattern completion)) ;partial completion
-           (delete-region beg end)      ;delete word
-	   (insert completion)
-           (message ""))
-	  (t
-	   (message "Making completion list...")
-	   (with-output-to-temp-buffer "*Completions*"
-	     (display-completion-list
-	      (all-completions pattern alist)))
-	   (message "Making completion list...%s" "done")))))
-
-;; (define-key ruby-mode-map "\M-\C-i" 'rct-complete-symbol)
-
-(defun rct-debuglog (logmsg)
-  "if `rct-debug' is non-nil, output LOGMSG into *Messages*. Returns LOGMSG."
-  (if rct-debug
-      (message "%s" logmsg))
-  logmsg)
-
-(defun rct-exec-and-eval (command opt)
-  "Execute rct-complete/rct-doc and evaluate the output."
-  (let ((eval-buffer  (get-buffer-create " *rct-eval*")))
-    ;; copy to temporary buffer to do completion at non-EOL.
-    (rct-shell-command
-     (format "%s %s %s --line=%d --column=%d %s"
-             command opt (or rct-option-local "")
-             (rct-current-line)
-             ;; specify column in BYTE
-             (string-bytes
-              (encode-coding-string
-               (buffer-substring (point-at-bol) (point))
-               buffer-file-coding-system))
-             (if rct-use-test-script (rct-test-script-option-string) ""))
-     eval-buffer)
-    (message "")
-    (eval (with-current-buffer eval-buffer
-            (goto-char 1)
-            (unwind-protect
-                (read (current-buffer))
-              (unless rct-debug (kill-buffer eval-buffer)))))))
-
-(defun rct-test-script-option-string ()
-  (if (null buffer-file-name)
-      ""
-    (let ((test-buf (rct-find-test-script-buffer))
-          (bfn buffer-file-name)
-          bfn2 t-opt test-filename)
-      (if (and test-buf
-               (setq bfn2 (buffer-local-value 'buffer-file-name test-buf))
-               (file-exists-p bfn2))
-          ;; pass test script's filename and lineno
-          (with-current-buffer test-buf
-            (setq t-opt (format "%s@%s" buffer-file-name (rct-current-line)))
-            (format "-t %s --filename=%s" t-opt bfn))
-        ""))))
-
-(require 'cl)
-
-(defun rct-find-test-script-buffer (&optional buffer-list)
-  "Find the latest used Ruby test script buffer."
-  (setq buffer-list (or buffer-list (buffer-list)))
-  (dolist (buf buffer-list)
-    (with-current-buffer buf
-      (if (and buffer-file-name (string-match "test.*\.rb$" buffer-file-name))
-          (return buf)))))
-
-;; (defun rct-find-test-method (buffer)
-;;   "Find test method on point on BUFFER."
-;;   (with-current-buffer buffer
-;;     (save-excursion
-;;       (forward-line 1)
-;;       (if (re-search-backward "^ *def *\\(test_[A-Za-z0-9?!_]+\\)" nil t)
-;;           (match-string 1)))))
-
-(defun rct-try-completion ()
-  "Evaluate the output of rct-complete."
-  (rct-exec-and-eval rct-complete-command-name "--completion-emacs"))
-
-;;;; TAGS or Ri
-(autoload 'ri "ri-ruby" nil t)
-(defvar rct-find-tag-if-available t
-  "If non-nil and the method location is in TAGS, go to the location instead of show documentation.")
-(defun rct-ri (&optional option)
-  "Browse Ri document at the point.
-If `rct-find-tag-if-available' is non-nil, search the definition using TAGS.
-
-See also `rct-interactive'. "
-  (interactive (rct-interactive))
-  (rct-exec-and-eval
-   rct-doc-command-name
-   (concat "--ri-emacs --use-method-analyzer "
-           (if (buffer-file-name)
-               (concat "--filename=" (buffer-file-name))
-             ""))))
-
-(defun rct-find-tag-or-ri (fullname)
-  (if (not rct-find-tag-if-available)
-      (ri fullname)
-    (condition-case err
-        (let ()
-          (visit-tags-table-buffer)
-          (find-tag-in-order (concat "::" fullname) 'search-forward '(tag-exact-match-p) nil  "containing" t))
-      (error
-       (ri fullname)))))
-
-;;;;
-(defun ruby-toggle-buffer ()
-  "Open a related file to the current buffer. test<=>impl."
-  (interactive)
-  (find-file (shell-command-to-string
-              (format "%s %s" ruby-toggle-file-command-name buffer-file-name))))
-
-;;;; rct-fork support
-(defun rct-fork (options)
-  "Run rct-fork.
-Rct-fork makes xmpfilter and completion MUCH FASTER because it pre-loads heavy libraries.
-When rct-fork is running, the mode-line indicates it to avoid unnecessary run.
-To kill rct-fork process, use \\[rct-fork-kill].
-"
-  (interactive (list
-                (read-string "rct-fork options (-e CODE -I LIBDIR -r LIB): "
-                             (rct-fork-default-options))))
-  (rct-fork-kill)
-  (rct-fork-minor-mode 1)
-  (start-process-shell-command
-   "rct-fork" "*rct-fork*" rct-fork-command-name options))
-
-(defun rct-fork-default-options ()
-  "Default options for rct-fork by collecting requires."
-  (mapconcat
-   (lambda (lib) (format "-r %s" lib))
-   (save-excursion
-     (goto-char (point-min))
-     (loop while (re-search-forward "\\<require\\> ['\"]\\([^'\"]+\\)['\"]" nil t)
-           collect (match-string-no-properties 1)))
-   " "))
-
-(defun rct-fork-kill ()
-  "Kill rct-fork process invoked by \\[rct-fork]."
-  (interactive)
-  (when rct-fork-minor-mode
-    (rct-fork-minor-mode -1)
-    (interrupt-process "rct-fork")))
-(define-minor-mode rct-fork-minor-mode
-  "This minor mode is turned on when rct-fork is run.
-It is nothing but an indicator."
-  :lighter " <rct-fork>" :global t)
-
-;;;; unit tests
-(when (and (fboundp 'expectations))
-  (require 'ruby-mode)
-  (require 'el-mock nil t)
-  (expectations
-    (desc "comment-dwim advice")
-    (expect "# =>"
-      (with-temp-buffer
-        (ruby-mode)
-        (setq last-command nil)
-        (call-interactively 'comment-dwim)
-        (setq last-command 'comment-dwim)
-        (call-interactively 'comment-dwim)
-        (buffer-string)))
-    (expect (regexp "^1 +# =>")
-      (with-temp-buffer
-        (ruby-mode)
-        (insert "1")
-        (setq last-command nil)
-        (call-interactively 'comment-dwim)
-        (setq last-command 'comment-dwim)
-        (call-interactively 'comment-dwim)
-        (buffer-string)))
-
-    (desc "rct-current-line")
-    (expect 1
-      (with-temp-buffer
-        (rct-current-line)))
-    (expect 1
-      (with-temp-buffer
-        (insert "1")
-        (rct-current-line)))
-    (expect 2
-      (with-temp-buffer
-        (insert "1\n")
-        (rct-current-line)))
-    (expect 2
-      (with-temp-buffer
-        (insert "1\n2")
-        (rct-current-line)))
-
-    (desc "rct-save-position")
-    (expect (mock (set-window-start * 7) => nil)
-      (stub window-start => 7)
-      (with-temp-buffer
-        (insert "abcdef\nghi")
-        (rct-save-position #'ignore)))
-    (expect 2
-      (with-temp-buffer
-        (stub window-start => 1)
-        (stub set-window-start => nil)
-        (insert "abcdef\nghi")
-        (rct-save-position #'ignore)
-        (rct-current-line)))
-    (expect 3
-      (with-temp-buffer
-        (stub window-start => 1)
-        (stub set-window-start => nil)
-        (insert "abcdef\nghi")
-        (rct-save-position #'ignore)
-        (current-column)))
-
-    (desc "rct-interactive")
-    (expect '("read")
-      (let ((current-prefix-arg t))
-        (stub read-from-minibuffer => "read")
-        (rct-interactive)))
-    (expect '("-S ruby19")
-      (let ((current-prefix-arg nil)
-            (rct-option-local "-S ruby19"))
-        (stub read-from-minibuffer => "read")
-        (rct-interactive)))
-    (expect '("")
-      (let ((current-prefix-arg nil)
-            (rct-option-local))
-        (stub read-from-minibuffer => "read")
-        (rct-interactive)))
-
-    (desc "rct-shell-command")
-    (expect "1+1 # => 2\n"
-      (with-temp-buffer
-        (insert "1+1 # =>\n")
-        (rct-shell-command "xmpfilter")
-        (buffer-string)))
-
-    (desc "xmp")
-
-    (desc "xmpfilter-command")
-    (expect "xmpfilter --rails"
-      (let ((xmpfilter-command-name "xmpfilter"))
-        (with-temp-buffer
-          (insert "class TestFoo < Test::Unit::TestCase\n")
-          (xmpfilter-command "--rails"))))
-    (expect "xmpfilter "
-      (let ((xmpfilter-command-name "xmpfilter"))
-        (with-temp-buffer
-          (insert "context 'foo' do\n")
-          (xmpfilter-command))))
-    (expect "xmpfilter "
-      (let ((xmpfilter-command-name "xmpfilter"))
-        (with-temp-buffer
-          (insert "describe Array do\n")
-          (xmpfilter-command))))
-    (expect "xmpfilter --unittest --rails"
-      (let ((xmpfilter-command-name "xmpfilter"))
-        (with-temp-buffer
-          (insert "class TestFoo < Test::Unit::TestCase\n"
-                  "  def test_0\n"
-                  "    1 + 1 # =>\n"
-                  "  end\n"
-                  "end\n")
-          (xmpfilter-command "--rails"))))
-    (expect "xmpfilter --spec "
-      (let ((xmpfilter-command-name "xmpfilter"))
-        (with-temp-buffer
-          (insert "context 'foo' do\n"
-                  "  specify \"foo\" do\n"
-                  "    1 + 1 # =>\n"
-                  "  end\n"
-                  "end\n")
-          (xmpfilter-command))))
-    (expect "xmpfilter --spec "
-      (let ((xmpfilter-command-name "xmpfilter"))
-        (with-temp-buffer
-          (insert "describe Array do\n"
-                  "  it \"foo\" do\n"
-                  "    [1] + [1] # =>\n"
-                  "  end\n"
-                  "end\n")
-          (xmpfilter-command))))
-    (expect "xmpfilter "
-      (let ((xmpfilter-command-name "xmpfilter"))
-        (with-temp-buffer
-          (insert "1 + 2\n")
-          (xmpfilter-command))))
-
-    (desc "rct-fork")
-    (expect t
-      (stub start-process-shell-command => t)
-      (stub interrupt-process => t)
-      (rct-fork "-r activesupport")
-      rct-fork-minor-mode)
-    (expect nil
-      (stub start-process-shell-command => t)
-      (stub interrupt-process => t)
-      (rct-fork "-r activesupport")
-      (rct-fork-kill)
-      rct-fork-minor-mode)
-    ))
-
-(provide 'rcodetools)
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/rcodetools.elc b/bundles/ruby.tmbundle/Support/vendor/rcodetools/rcodetools.elc
deleted file mode 100644
index a5c67c0ed7a63e2c7928fdd7125020fb8169e555..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 14540
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

diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/rcodetools.gif b/bundles/ruby.tmbundle/Support/vendor/rcodetools/rcodetools.gif
deleted file mode 100644
index 7c35fe78dc01862469a49c2476cbb5e5ffe2b050..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 32432
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
OO@~Z+_y3~#llUj-QCfZg

diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/rcodetools.sxmp b/bundles/ruby.tmbundle/Support/vendor/rcodetools/rcodetools.sxmp
deleted file mode 100644
index a81418acd5e4544f0f0743c37ba26584bdfc15f2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4859
zcmds5ZByGu5YA`)ij7Q1r#6-lZ>A8%!(^syro%MTx9J2EjeI)81xcseoq!g|Z||O7
zjE%uBgk+}WgYm8Qo?We0`#k40kmd02&@rFTeUtJbIMy1l%R)#EMXXQ5PrjrgVOoe(
z`9q%Xt-U??{U_r@PX#!ECx#ywb>O;!f^Guc-#}8`r6Ma*rWtg*2|LHn#=u41Wm!yB
zms3ttrU0*{JZE757Dkqlko+WUfGZ18DW@!P$HrK)5xPaOVmi!uT6+!INJs`~i_%!>
z=t9VeJqDU6EqMW=pr^4^w|M57$Ijz4G7dRLuMoYAVFjuitRuuD&E(twg%p%2HJNPA
zE=&b2LZZv8h=QQk>+Njq>;%!q)@E-b+TILyd)tv@^c+GUfosk4GcE+3s@z1Ph?XUD
zaTym^*V#4LovZ9-ux`V5=m#(l3PY+g)rc50Xe4tzo~wdUjewe-68J_Q4GualNq_H;
zd??C1ar=i@6_M-#@xJZ5uLkdq!95C&Jyi~gKR7_+fK-<TF8*@|?|k>lq_q~@;K#;|
z4L7xK=jCgBPHL~l>G&?RejfT*%O|fzr0{-i4@+$WA1!y+Avjh14(@Uw&J!#{A^CZ%
zS!5o(NTP&|urZT9+2c9aJWlyP%w0M$`xo<S=#F_7+0to!0{{KbOy(@@_*GW*!aNrp
z=d{gDkx`r~W}X*K%Y^kITP`unb*&rMJCUp){`;!A{rN4|w&tNo%9KGEhKmY}o!no-
zXK%5OM@@@ZYf2|fO0OujBKGsY4&TnaM#1;Hz4hQZb|QqYz|?#}@6&UyY8=x!3;n$h
zg69PNTo<md=R)JC;M!EV`^0}%T?A{1+y8-I=4A%e)724Ao;9sFHavZDNo*#`kzI$j
zUw}OhHdtR@zng%4Y!MumC%Hv%V1KMAqkiiqi9*Li>^O&z2{3(h7wgz|0qb1@;Y+IY
z^cEXDXkW&0Qurj>El6}Y*YhT0yEUJg)`RwjT+2n)tC{i<B-gMaGSpd@rkv%vrM-=c
z8`Cn&!wmpmXN517Cx;c~)MPjkHUG3ci0f4-aJ+q*{TlNW@l|nZ-m632OL;Be1lysh
zB|6DImK=%L842M$KzlpUZf|RA^Op7$OGo#Qq1LrxzPd#e%8lt!tyW^d7V?$>P5A!~
z2|kejQam`bca{gMVocX}B`TZ=F@F2zQsK<DC#S+Y5h^Og@t+Ec((gQ$+>9I3TvY`s
z>hY+kh*x8WHJmvT4-n=Ae5K_U5azV|{e(H~b3b8D`7BGAJJDuudvkjsVNQcDCd}4<
z3Bqh$anO7r!ep0>mUslgqeo^0URcr0)C_*(Xa1?kn2(d4pK;W@zLNCrp=Y6!IXZP2
z7@Z<Y?MWsImJ?^;K0FbOc#7=f;oQe>3{N06!q9mE&V}Rdx7z3PFpYYWx0vggVv)ua
zr}X1;<hg;{Klt^>KU*krbnNb@B2K{m3`~1}j?TH;wY3reB$`&?;8$GAvuBNlHs6f_
zk24b{TzxqOR3~K=5GFIBecIHFX*RoQD<-(ALNdX|+6Wg$6%kB9o}qan-q?;Yrmo=n
z0VRcKlN!n_-5R<wPk=XelfDsMw^xki9>q06q(-<ka;vG{q}*Ed2Zcvyt(COs|FO~?
bngIURgFgiAHzM~dRDBIPFcbIdi0gj=8Bxd-

diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/rcodetools.vim b/bundles/ruby.tmbundle/Support/vendor/rcodetools/rcodetools.vim
deleted file mode 100644
index 0796f007d..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/rcodetools.vim
+++ /dev/null
@@ -1,173 +0,0 @@
-" Copyright (C) 2006    Mauricio Fernandez <mfp@acm.org>
-" rcodetools support plugin
-"
-
-if exists("loaded_rcodetools")
-    finish
-endif
-
-let loaded_rcodetools = 1
-let s:save_cpo = &cpo
-set cpo&vim
-
-"{{{ set s:sid
-
-map <SID>xx <SID>xx
-let s:sid = maparg("<SID>xx")
-unmap <SID>xx
-let s:sid = substitute(s:sid, 'xx', '', '')
-
-"{{{ function: s:spellgetoption(name, default)
-" grab a user-specified option to override the default provided.  options are
-" searched in the window, buffer, then global spaces.
-function! s:GetOption(name, default)
-    if exists("w:{&filetype}_" . a:name)
-        execute "return w:{&filetype}_".a:name
-    elseif exists("w:" . a:name)
-        execute "return w:".a:name
-    elseif exists("b:{&filetype}_" . a:name)
-        execute "return b:{&filetype}_".a:name
-    elseif exists("b:" . a:name)
-        execute "return b:".a:name
-    elseif exists("g:{&filetype}_" . a:name)
-        execute "return g:{&filetype}_".a:name
-    elseif exists("g:" . a:name)
-        execute "return g:".a:name
-    else
-        return a:default
-    endif
-endfunction
-
-"{{{ IsOptionSet
-function! s:IsOptionSet(name)
-    let bogus_val = "df hdsoi3y98 hjsdfhdkj"
-    return s:GetOption(a:name, bogus_val) == bogus_val ? 0 : 1
-endfunction
-
-
-"{{{ RCT_completion function
-
-let s:last_test_file = ""
-let s:last_test_lineno = 0
-
-let s:rct_completion_col = 0
-let s:rct_tmpfile = ""
-
-function! <SID>RCT_command_with_test_options(cmd)
-    if s:last_test_file != ""
-	return a:cmd .
-		    \ "-" . "-filename='" . expand("%:p") . "' " .
-		    \ "-t '" . s:last_test_file . "@" . s:last_test_lineno . "' "
-    endif
-    return a:cmd
-endfunction
-
-function! <SID>RCT_completion(findstart, base)
-    if a:findstart
-	let s:rct_completion_col = col('.') - 1
-	let s:rct_tmpfile = "tmp-rcodetools" . strftime("Y-%m-%d-%H-%M-%S.rb")
-        silent exec ":w " . s:rct_tmpfile
-	return strridx(getline('.'), '.', col('.')) + 1
-    else
-	let line    = line('.')
-	let column  = s:rct_completion_col
-
-	let command = "rct-complete --completion-class-info --dev --fork --line=" .
-		    \ line . " --column=" . column . " "
-	let command = <SID>RCT_command_with_test_options(command) . s:rct_tmpfile
-
-	let data = split(system(command), '\n')
-
-	for dline in data
-	    let parts    = split(dline, "\t")
-	    let name     = get(parts, 0)
-	    let selector = get(parts, 1)
-	    echo name
-	    echo selector
-	    if s:GetOption('rct_completion_use_fri', 0) && s:GetOption('rct_completion_info_max_len', 20) >= len(data)
-		let fri_data = system('fri -f plain ' . "'" .  selector . "'" . ' 2>/dev/null')
-		call complete_add({'word': name,
-			        \  'menu': get(split(fri_data), 2, ''),
-			        \  'info': fri_data } )
-	    else
-		call complete_add(name)
-	    endif
-	    if complete_check()
-		break
-	    endif
-	endfor
-
-	call delete(s:rct_tmpfile)
-	return []
-    endif
-endfunction
-
-"{{{ ri functions
-
-function! <SID>RCT_new_ri_window()
-  execute "new"
-  execute "set bufhidden=delete buftype=nofile noswapfile nobuflisted"
-  execute 'nmap <buffer><silent> <C-T> 2u'
-  execute 'nmap <buffer><silent> <C-]> :call' . s:sid . 'RCT_execute_ri(expand("<cWORD>"))<cr>'
-endfunction
-
-function! <SID>RCT_execute_ri(query_term)
-  silent %delete _
-  let term = matchstr(a:query_term, '\v[^,.;]+')
-  let cmd = s:GetOption("RCT_ri_cmd", "fri -f plain ")
-  let text = system(cmd . "'" . term . "'")
-  call append(0, split(text, "\n"))
-  normal gg
-endfunction
-
-function! RCT_find_tag_or_ri(fullname)
-    " rubikitch: modified for rtags-compatible tags
-    let tagname = '::' . a:fullname
-    let tagresults = taglist(tagname)
-    if len(tagresults) != 0
-	execute "tjump " . tagname
-    else
-        call <SID>RCT_new_ri_window()
-        call <SID>RCT_execute_ri(a:fullname)
-    endif
-endfunction
-
-function! <SID>RCT_smart_ri()
-  let tmpfile = "tmp-rcodetools" . strftime("Y-%m-%d-%H-%M-%S.rb")
-  silent exec ":w " . tmpfile
-
-  let line    = line('.')
-  let column  = col('.') - 1
-  let command = "rct-doc --ri-vim --line=" . line . " --column=" . column . " "
-  let command = <SID>RCT_command_with_test_options(command) . tmpfile
-  "let term = matchstr(system(command), "\\v[^\n]+")
-  exec system(command)
-  call delete(tmpfile)
-  "call RCT_find_tag_or_ri(term)
-endfunction
-
-function! <SID>RCT_ruby_toggle()
-  let curr_file = expand("%:p")
-  let cmd = "ruby -S ruby-toggle-file " . curr_file
-  if match(curr_file, '\v_test|test_') != -1
-      let s:last_test_file = curr_file
-      let s:last_test_lineno = line(".")
-  endif
-  let dest = system(cmd)
-  silent exec ":w"
-  exec ("edit " . dest)
-  silent! normal g;
-endfunction
-
-"{{{ bindings and au
-
-if v:version >= 700
-    execute "au Filetype ruby setlocal completefunc=" . s:sid . "RCT_completion"
-endif
-execute 'au Filetype ruby nmap <buffer><silent> <C-]> :exec "call ' .
-         \ 'RCT_find_tag_or_ri(''" . expand("<cword>") . "'')"<cr>'
-execute 'au Filetype ruby nmap <buffer><silent>' . s:GetOption("RCT_ri_binding", "<LocalLeader>r") .
-        \ ' :call ' .  s:sid . 'RCT_smart_ri()<cr>'
-execute 'au Filetype ruby nmap <buffer><silent>' . s:GetOption("RCT_toggle_binding", "<LocalLeader>t") .
-        \ ' :call ' .  s:sid . 'RCT_ruby_toggle()<cr>'
-let &cpo = s:save_cpo
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/setup.rb b/bundles/ruby.tmbundle/Support/vendor/rcodetools/setup.rb
deleted file mode 100644
index 424a5f37c..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/setup.rb
+++ /dev/null
@@ -1,1585 +0,0 @@
-#
-# setup.rb
-#
-# Copyright (c) 2000-2005 Minero Aoki
-#
-# This program is free software.
-# You can distribute/modify this program under the terms of
-# the GNU LGPL, Lesser General Public License version 2.1.
-#
-
-unless Enumerable.method_defined?(:map)   # Ruby 1.4.6
-  module Enumerable
-    alias map collect
-  end
-end
-
-unless File.respond_to?(:read)   # Ruby 1.6
-  def File.read(fname)
-    open(fname) {|f|
-      return f.read
-    }
-  end
-end
-
-unless Errno.const_defined?(:ENOTEMPTY)   # Windows?
-  module Errno
-    class ENOTEMPTY
-      # We do not raise this exception, implementation is not needed.
-    end
-  end
-end
-
-def File.binread(fname)
-  open(fname, 'rb') {|f|
-    return f.read
-  }
-end
-
-# for corrupted Windows' stat(2)
-def File.dir?(path)
-  File.directory?((path[-1,1] == '/') ? path : path + '/')
-end
-
-
-class ConfigTable
-
-  include Enumerable
-
-  def initialize(rbconfig)
-    @rbconfig = rbconfig
-    @items = []
-    @table = {}
-    # options
-    @install_prefix = nil
-    @config_opt = nil
-    @verbose = true
-    @no_harm = false
-  end
-
-  attr_accessor :install_prefix
-  attr_accessor :config_opt
-
-  attr_writer :verbose
-
-  def verbose?
-    @verbose
-  end
-
-  attr_writer :no_harm
-
-  def no_harm?
-    @no_harm
-  end
-
-  def [](key)
-    lookup(key).resolve(self)
-  end
-
-  def []=(key, val)
-    lookup(key).set val
-  end
-
-  def names
-    @items.map {|i| i.name }
-  end
-
-  def each(&block)
-    @items.each(&block)
-  end
-
-  def key?(name)
-    @table.key?(name)
-  end
-
-  def lookup(name)
-    @table[name] or setup_rb_error "no such config item: #{name}"
-  end
-
-  def add(item)
-    @items.push item
-    @table[item.name] = item
-  end
-
-  def remove(name)
-    item = lookup(name)
-    @items.delete_if {|i| i.name == name }
-    @table.delete_if {|name, i| i.name == name }
-    item
-  end
-
-  def load_script(path, inst = nil)
-    if File.file?(path)
-      MetaConfigEnvironment.new(self, inst).instance_eval File.read(path), path
-    end
-  end
-
-  def savefile
-    '.config'
-  end
-
-  def load_savefile
-    begin
-      File.foreach(savefile()) do |line|
-        k, v = *line.split(/=/, 2)
-        self[k] = v.strip
-      end
-    rescue Errno::ENOENT
-      setup_rb_error $!.message + "\n#{File.basename($0)} config first"
-    end
-  end
-
-  def save
-    @items.each {|i| i.value }
-    File.open(savefile(), 'w') {|f|
-      @items.each do |i|
-        f.printf "%s=%s\n", i.name, i.value if i.value? and i.value
-      end
-    }
-  end
-
-  def load_standard_entries
-    standard_entries(@rbconfig).each do |ent|
-      add ent
-    end
-  end
-
-  def standard_entries(rbconfig)
-    c = rbconfig
-
-    rubypath = File.join(c['bindir'], c['ruby_install_name'] + c['EXEEXT'])
-
-    major = c['MAJOR'].to_i
-    minor = c['MINOR'].to_i
-    teeny = c['TEENY'].to_i
-    version = "#{major}.#{minor}"
-
-    # ruby ver. >= 1.4.4?
-    newpath_p = ((major >= 2) or
-                 ((major == 1) and
-                  ((minor >= 5) or
-                   ((minor == 4) and (teeny >= 4)))))
-
-    if c['rubylibdir']
-      # V > 1.6.3
-      libruby         = "#{c['prefix']}/lib/ruby"
-      librubyver      = c['rubylibdir']
-      librubyverarch  = c['archdir']
-      siteruby        = c['sitedir']
-      siterubyver     = c['sitelibdir']
-      siterubyverarch = c['sitearchdir']
-    elsif newpath_p
-      # 1.4.4 <= V <= 1.6.3
-      libruby         = "#{c['prefix']}/lib/ruby"
-      librubyver      = "#{c['prefix']}/lib/ruby/#{version}"
-      librubyverarch  = "#{c['prefix']}/lib/ruby/#{version}/#{c['arch']}"
-      siteruby        = c['sitedir']
-      siterubyver     = "$siteruby/#{version}"
-      siterubyverarch = "$siterubyver/#{c['arch']}"
-    else
-      # V < 1.4.4
-      libruby         = "#{c['prefix']}/lib/ruby"
-      librubyver      = "#{c['prefix']}/lib/ruby/#{version}"
-      librubyverarch  = "#{c['prefix']}/lib/ruby/#{version}/#{c['arch']}"
-      siteruby        = "#{c['prefix']}/lib/ruby/#{version}/site_ruby"
-      siterubyver     = siteruby
-      siterubyverarch = "$siterubyver/#{c['arch']}"
-    end
-    parameterize = lambda {|path|
-      path.sub(/\A#{Regexp.quote(c['prefix'])}/, '$prefix')
-    }
-
-    if arg = c['configure_args'].split.detect {|arg| /--with-make-prog=/ =~ arg }
-      makeprog = arg.sub(/'/, '').split(/=/, 2)[1]
-    else
-      makeprog = 'make'
-    end
-
-    [
-      ExecItem.new('installdirs', 'std/site/home',
-                   'std: install under libruby; site: install under site_ruby; home: install under $HOME')\
-          {|val, table|
-            case val
-            when 'std'
-              table['rbdir'] = '$librubyver'
-              table['sodir'] = '$librubyverarch'
-            when 'site'
-              table['rbdir'] = '$siterubyver'
-              table['sodir'] = '$siterubyverarch'
-            when 'home'
-              setup_rb_error '$HOME was not set' unless ENV['HOME']
-              table['prefix'] = ENV['HOME']
-              table['rbdir'] = '$libdir/ruby'
-              table['sodir'] = '$libdir/ruby'
-            end
-          },
-      PathItem.new('prefix', 'path', c['prefix'],
-                   'path prefix of target environment'),
-      PathItem.new('bindir', 'path', parameterize.call(c['bindir']),
-                   'the directory for commands'),
-      PathItem.new('libdir', 'path', parameterize.call(c['libdir']),
-                   'the directory for libraries'),
-      PathItem.new('datadir', 'path', parameterize.call(c['datadir']),
-                   'the directory for shared data'),
-      PathItem.new('mandir', 'path', parameterize.call(c['mandir']),
-                   'the directory for man pages'),
-      PathItem.new('sysconfdir', 'path', parameterize.call(c['sysconfdir']),
-                   'the directory for system configuration files'),
-      PathItem.new('localstatedir', 'path', parameterize.call(c['localstatedir']),
-                   'the directory for local state data'),
-      PathItem.new('libruby', 'path', libruby,
-                   'the directory for ruby libraries'),
-      PathItem.new('librubyver', 'path', librubyver,
-                   'the directory for standard ruby libraries'),
-      PathItem.new('librubyverarch', 'path', librubyverarch,
-                   'the directory for standard ruby extensions'),
-      PathItem.new('siteruby', 'path', siteruby,
-          'the directory for version-independent aux ruby libraries'),
-      PathItem.new('siterubyver', 'path', siterubyver,
-                   'the directory for aux ruby libraries'),
-      PathItem.new('siterubyverarch', 'path', siterubyverarch,
-                   'the directory for aux ruby binaries'),
-      PathItem.new('rbdir', 'path', '$siterubyver',
-                   'the directory for ruby scripts'),
-      PathItem.new('sodir', 'path', '$siterubyverarch',
-                   'the directory for ruby extentions'),
-      PathItem.new('rubypath', 'path', rubypath,
-                   'the path to set to #! line'),
-      ProgramItem.new('rubyprog', 'name', rubypath,
-                      'the ruby program using for installation'),
-      ProgramItem.new('makeprog', 'name', makeprog,
-                      'the make program to compile ruby extentions'),
-      SelectItem.new('shebang', 'all/ruby/never', 'ruby',
-                     'shebang line (#!) editing mode'),
-      BoolItem.new('without-ext', 'yes/no', 'no',
-                   'does not compile/install ruby extentions')
-    ]
-  end
-  private :standard_entries
-
-  def load_multipackage_entries
-    multipackage_entries().each do |ent|
-      add ent
-    end
-  end
-
-  def multipackage_entries
-    [
-      PackageSelectionItem.new('with', 'name,name...', '', 'ALL',
-                               'package names that you want to install'),
-      PackageSelectionItem.new('without', 'name,name...', '', 'NONE',
-                               'package names that you do not want to install')
-    ]
-  end
-  private :multipackage_entries
-
-  ALIASES = {
-    'std-ruby'         => 'librubyver',
-    'stdruby'          => 'librubyver',
-    'rubylibdir'       => 'librubyver',
-    'archdir'          => 'librubyverarch',
-    'site-ruby-common' => 'siteruby',     # For backward compatibility
-    'site-ruby'        => 'siterubyver',  # For backward compatibility
-    'bin-dir'          => 'bindir',
-    'bin-dir'          => 'bindir',
-    'rb-dir'           => 'rbdir',
-    'so-dir'           => 'sodir',
-    'data-dir'         => 'datadir',
-    'ruby-path'        => 'rubypath',
-    'ruby-prog'        => 'rubyprog',
-    'ruby'             => 'rubyprog',
-    'make-prog'        => 'makeprog',
-    'make'             => 'makeprog'
-  }
-
-  def fixup
-    ALIASES.each do |ali, name|
-      @table[ali] = @table[name]
-    end
-    @items.freeze
-    @table.freeze
-    @options_re = /\A--(#{@table.keys.join('|')})(?:=(.*))?\z/
-  end
-
-  def parse_opt(opt)
-    m = @options_re.match(opt) or setup_rb_error "config: unknown option #{opt}"
-    m.to_a[1,2]
-  end
-
-  def dllext
-    @rbconfig['DLEXT']
-  end
-
-  def value_config?(name)
-    lookup(name).value?
-  end
-
-  class Item
-    def initialize(name, template, default, desc)
-      @name = name.freeze
-      @template = template
-      @value = default
-      @default = default
-      @description = desc
-    end
-
-    attr_reader :name
-    attr_reader :description
-
-    attr_accessor :default
-    alias help_default default
-
-    def help_opt
-      "--#{@name}=#{@template}"
-    end
-
-    def value?
-      true
-    end
-
-    def value
-      @value
-    end
-
-    def resolve(table)
-      @value.gsub(%r<\$([^/]+)>) { table[$1] }
-    end
-
-    def set(val)
-      @value = check(val)
-    end
-
-    private
-
-    def check(val)
-      setup_rb_error "config: --#{name} requires argument" unless val
-      val
-    end
-  end
-
-  class BoolItem < Item
-    def config_type
-      'bool'
-    end
-
-    def help_opt
-      "--#{@name}"
-    end
-
-    private
-
-    def check(val)
-      return 'yes' unless val
-      case val
-      when /\Ay(es)?\z/i, /\At(rue)?\z/i then 'yes'
-      when /\An(o)?\z/i, /\Af(alse)\z/i  then 'no'
-      else
-        setup_rb_error "config: --#{@name} accepts only yes/no for argument"
-      end
-    end
-  end
-
-  class PathItem < Item
-    def config_type
-      'path'
-    end
-
-    private
-
-    def check(path)
-      setup_rb_error "config: --#{@name} requires argument"  unless path
-      path[0,1] == '$' ? path : File.expand_path(path)
-    end
-  end
-
-  class ProgramItem < Item
-    def config_type
-      'program'
-    end
-  end
-
-  class SelectItem < Item
-    def initialize(name, selection, default, desc)
-      super
-      @ok = selection.split('/')
-    end
-
-    def config_type
-      'select'
-    end
-
-    private
-
-    def check(val)
-      unless @ok.include?(val.strip)
-        setup_rb_error "config: use --#{@name}=#{@template} (#{val})"
-      end
-      val.strip
-    end
-  end
-
-  class ExecItem < Item
-    def initialize(name, selection, desc, &block)
-      super name, selection, nil, desc
-      @ok = selection.split('/')
-      @action = block
-    end
-
-    def config_type
-      'exec'
-    end
-
-    def value?
-      false
-    end
-
-    def resolve(table)
-      setup_rb_error "$#{name()} wrongly used as option value"
-    end
-
-    undef set
-
-    def evaluate(val, table)
-      v = val.strip.downcase
-      unless @ok.include?(v)
-        setup_rb_error "invalid option --#{@name}=#{val} (use #{@template})"
-      end
-      @action.call v, table
-    end
-  end
-
-  class PackageSelectionItem < Item
-    def initialize(name, template, default, help_default, desc)
-      super name, template, default, desc
-      @help_default = help_default
-    end
-
-    attr_reader :help_default
-
-    def config_type
-      'package'
-    end
-
-    private
-
-    def check(val)
-      unless File.dir?("packages/#{val}")
-        setup_rb_error "config: no such package: #{val}"
-      end
-      val
-    end
-  end
-
-  class MetaConfigEnvironment
-    def initialize(config, installer)
-      @config = config
-      @installer = installer
-    end
-
-    def config_names
-      @config.names
-    end
-
-    def config?(name)
-      @config.key?(name)
-    end
-
-    def bool_config?(name)
-      @config.lookup(name).config_type == 'bool'
-    end
-
-    def path_config?(name)
-      @config.lookup(name).config_type == 'path'
-    end
-
-    def value_config?(name)
-      @config.lookup(name).config_type != 'exec'
-    end
-
-    def add_config(item)
-      @config.add item
-    end
-
-    def add_bool_config(name, default, desc)
-      @config.add BoolItem.new(name, 'yes/no', default ? 'yes' : 'no', desc)
-    end
-
-    def add_path_config(name, default, desc)
-      @config.add PathItem.new(name, 'path', default, desc)
-    end
-
-    def set_config_default(name, default)
-      @config.lookup(name).default = default
-    end
-
-    def remove_config(name)
-      @config.remove(name)
-    end
-
-    # For only multipackage
-    def packages
-      raise '[setup.rb fatal] multi-package metaconfig API packages() called for single-package; contact application package vendor' unless @installer
-      @installer.packages
-    end
-
-    # For only multipackage
-    def declare_packages(list)
-      raise '[setup.rb fatal] multi-package metaconfig API declare_packages() called for single-package; contact application package vendor' unless @installer
-      @installer.packages = list
-    end
-  end
-
-end   # class ConfigTable
-
-
-# This module requires: #verbose?, #no_harm?
-module FileOperations
-
-  def mkdir_p(dirname, prefix = nil)
-    dirname = prefix + File.expand_path(dirname) if prefix
-    $stderr.puts "mkdir -p #{dirname}" if verbose?
-    return if no_harm?
-
-    # Does not check '/', it's too abnormal.
-    dirs = File.expand_path(dirname).split(%r<(?=/)>)
-    if /\A[a-z]:\z/i =~ dirs[0]
-      disk = dirs.shift
-      dirs[0] = disk + dirs[0]
-    end
-    dirs.each_index do |idx|
-      path = dirs[0..idx].join('')
-      Dir.mkdir path unless File.dir?(path)
-    end
-  end
-
-  def rm_f(path)
-    $stderr.puts "rm -f #{path}" if verbose?
-    return if no_harm?
-    force_remove_file path
-  end
-
-  def rm_rf(path)
-    $stderr.puts "rm -rf #{path}" if verbose?
-    return if no_harm?
-    remove_tree path
-  end
-
-  def remove_tree(path)
-    if File.symlink?(path)
-      remove_file path
-    elsif File.dir?(path)
-      remove_tree0 path
-    else
-      force_remove_file path
-    end
-  end
-
-  def remove_tree0(path)
-    Dir.foreach(path) do |ent|
-      next if ent == '.'
-      next if ent == '..'
-      entpath = "#{path}/#{ent}"
-      if File.symlink?(entpath)
-        remove_file entpath
-      elsif File.dir?(entpath)
-        remove_tree0 entpath
-      else
-        force_remove_file entpath
-      end
-    end
-    begin
-      Dir.rmdir path
-    rescue Errno::ENOTEMPTY
-      # directory may not be empty
-    end
-  end
-
-  def move_file(src, dest)
-    force_remove_file dest
-    begin
-      File.rename src, dest
-    rescue
-      File.open(dest, 'wb') {|f|
-        f.write File.binread(src)
-      }
-      File.chmod File.stat(src).mode, dest
-      File.unlink src
-    end
-  end
-
-  def force_remove_file(path)
-    begin
-      remove_file path
-    rescue
-    end
-  end
-
-  def remove_file(path)
-    File.chmod 0777, path
-    File.unlink path
-  end
-
-  def install(from, dest, mode, prefix = nil)
-    $stderr.puts "install #{from} #{dest}" if verbose?
-    return if no_harm?
-
-    realdest = prefix ? prefix + File.expand_path(dest) : dest
-    realdest = File.join(realdest, File.basename(from)) if File.dir?(realdest)
-    str = File.binread(from)
-    if diff?(str, realdest)
-      verbose_off {
-        rm_f realdest if File.exist?(realdest)
-      }
-      File.open(realdest, 'wb') {|f|
-        f.write str
-      }
-      File.chmod mode, realdest
-
-      File.open("#{objdir_root()}/InstalledFiles", 'a') {|f|
-        if prefix
-          f.puts realdest.sub(prefix, '')
-        else
-          f.puts realdest
-        end
-      }
-    end
-  end
-
-  def diff?(new_content, path)
-    return true unless File.exist?(path)
-    new_content != File.binread(path)
-  end
-
-  def command(*args)
-    $stderr.puts args.join(' ') if verbose?
-    system(*args) or raise RuntimeError,
-        "system(#{args.map{|a| a.inspect }.join(' ')}) failed"
-  end
-
-  def ruby(*args)
-    command config('rubyprog'), *args
-  end
-  
-  def make(task = nil)
-    command(*[config('makeprog'), task].compact)
-  end
-
-  def extdir?(dir)
-    File.exist?("#{dir}/MANIFEST") or File.exist?("#{dir}/extconf.rb")
-  end
-
-  def files_of(dir)
-    Dir.open(dir) {|d|
-      return d.select {|ent| File.file?("#{dir}/#{ent}") }
-    }
-  end
-
-  DIR_REJECT = %w( . .. CVS SCCS RCS CVS.adm .svn )
-
-  def directories_of(dir)
-    Dir.open(dir) {|d|
-      return d.select {|ent| File.dir?("#{dir}/#{ent}") } - DIR_REJECT
-    }
-  end
-
-end
-
-
-# This module requires: #srcdir_root, #objdir_root, #relpath
-module HookScriptAPI
-
-  def get_config(key)
-    @config[key]
-  end
-
-  alias config get_config
-
-  # obsolete: use metaconfig to change configuration
-  def set_config(key, val)
-    @config[key] = val
-  end
-
-  #
-  # srcdir/objdir (works only in the package directory)
-  #
-
-  def curr_srcdir
-    "#{srcdir_root()}/#{relpath()}"
-  end
-
-  def curr_objdir
-    "#{objdir_root()}/#{relpath()}"
-  end
-
-  def srcfile(path)
-    "#{curr_srcdir()}/#{path}"
-  end
-
-  def srcexist?(path)
-    File.exist?(srcfile(path))
-  end
-
-  def srcdirectory?(path)
-    File.dir?(srcfile(path))
-  end
-  
-  def srcfile?(path)
-    File.file?(srcfile(path))
-  end
-
-  def srcentries(path = '.')
-    Dir.open("#{curr_srcdir()}/#{path}") {|d|
-      return d.to_a - %w(. ..)
-    }
-  end
-
-  def srcfiles(path = '.')
-    srcentries(path).select {|fname|
-      File.file?(File.join(curr_srcdir(), path, fname))
-    }
-  end
-
-  def srcdirectories(path = '.')
-    srcentries(path).select {|fname|
-      File.dir?(File.join(curr_srcdir(), path, fname))
-    }
-  end
-
-end
-
-
-class ToplevelInstaller
-
-  Version   = '3.4.1'
-  Copyright = 'Copyright (c) 2000-2005 Minero Aoki'
-
-  TASKS = [
-    [ 'all',      'do config, setup, then install' ],
-    [ 'config',   'saves your configurations' ],
-    [ 'show',     'shows current configuration' ],
-    [ 'setup',    'compiles ruby extentions and others' ],
-    [ 'install',  'installs files' ],
-    [ 'test',     'run all tests in test/' ],
-    [ 'clean',    "does `make clean' for each extention" ],
-    [ 'distclean',"does `make distclean' for each extention" ]
-  ]
-
-  def ToplevelInstaller.invoke
-    config = ConfigTable.new(load_rbconfig())
-    config.load_standard_entries
-    config.load_multipackage_entries if multipackage?
-    config.fixup
-    klass = (multipackage?() ? ToplevelInstallerMulti : ToplevelInstaller)
-    klass.new(File.dirname($0), config).invoke
-  end
-
-  def ToplevelInstaller.multipackage?
-    File.dir?(File.dirname($0) + '/packages')
-  end
-
-  def ToplevelInstaller.load_rbconfig
-    if arg = ARGV.detect {|arg| /\A--rbconfig=/ =~ arg }
-      ARGV.delete(arg)
-      load File.expand_path(arg.split(/=/, 2)[1])
-      $".push 'rbconfig.rb'
-    else
-      require 'rbconfig'
-    end
-    ::Config::CONFIG
-  end
-
-  def initialize(ardir_root, config)
-    @ardir = File.expand_path(ardir_root)
-    @config = config
-    # cache
-    @valid_task_re = nil
-  end
-
-  def config(key)
-    @config[key]
-  end
-
-  def inspect
-    "#<#{self.class} #{__id__()}>"
-  end
-
-  def invoke
-    run_metaconfigs
-    case task = parsearg_global()
-    when nil, 'all'
-      parsearg_config
-      init_installers
-      exec_config
-      exec_setup
-      exec_install
-    else
-      case task
-      when 'config', 'test'
-        ;
-      when 'clean', 'distclean'
-        @config.load_savefile if File.exist?(@config.savefile)
-      else
-        @config.load_savefile
-      end
-      __send__ "parsearg_#{task}"
-      init_installers
-      __send__ "exec_#{task}"
-    end
-  end
-  
-  def run_metaconfigs
-    @config.load_script "#{@ardir}/metaconfig"
-  end
-
-  def init_installers
-    @installer = Installer.new(@config, @ardir, File.expand_path('.'))
-  end
-
-  #
-  # Hook Script API bases
-  #
-
-  def srcdir_root
-    @ardir
-  end
-
-  def objdir_root
-    '.'
-  end
-
-  def relpath
-    '.'
-  end
-
-  #
-  # Option Parsing
-  #
-
-  def parsearg_global
-    while arg = ARGV.shift
-      case arg
-      when /\A\w+\z/
-        setup_rb_error "invalid task: #{arg}" unless valid_task?(arg)
-        return arg
-      when '-q', '--quiet'
-        @config.verbose = false
-      when '--verbose'
-        @config.verbose = true
-      when '--help'
-        print_usage $stdout
-        exit 0
-      when '--version'
-        puts "#{File.basename($0)} version #{Version}"
-        exit 0
-      when '--copyright'
-        puts Copyright
-        exit 0
-      else
-        setup_rb_error "unknown global option '#{arg}'"
-      end
-    end
-    nil
-  end
-
-  def valid_task?(t)
-    valid_task_re() =~ t
-  end
-
-  def valid_task_re
-    @valid_task_re ||= /\A(?:#{TASKS.map {|task,desc| task }.join('|')})\z/
-  end
-
-  def parsearg_no_options
-    unless ARGV.empty?
-      task = caller(0).first.slice(%r<`parsearg_(\w+)'>, 1)
-      setup_rb_error "#{task}: unknown options: #{ARGV.join(' ')}"
-    end
-  end
-
-  alias parsearg_show       parsearg_no_options
-  alias parsearg_setup      parsearg_no_options
-  alias parsearg_test       parsearg_no_options
-  alias parsearg_clean      parsearg_no_options
-  alias parsearg_distclean  parsearg_no_options
-
-  def parsearg_config
-    evalopt = []
-    set = []
-    @config.config_opt = []
-    while i = ARGV.shift
-      if /\A--?\z/ =~ i
-        @config.config_opt = ARGV.dup
-        break
-      end
-      name, value = *@config.parse_opt(i)
-      if @config.value_config?(name)
-        @config[name] = value
-      else
-        evalopt.push [name, value]
-      end
-      set.push name
-    end
-    evalopt.each do |name, value|
-      @config.lookup(name).evaluate value, @config
-    end
-    # Check if configuration is valid
-    set.each do |n|
-      @config[n] if @config.value_config?(n)
-    end
-  end
-
-  def parsearg_install
-    @config.no_harm = false
-    @config.install_prefix = ''
-    while a = ARGV.shift
-      case a
-      when '--no-harm'
-        @config.no_harm = true
-      when /\A--prefix=/
-        path = a.split(/=/, 2)[1]
-        path = File.expand_path(path) unless path[0,1] == '/'
-        @config.install_prefix = path
-      else
-        setup_rb_error "install: unknown option #{a}"
-      end
-    end
-  end
-
-  def print_usage(out)
-    out.puts 'Typical Installation Procedure:'
-    out.puts "  $ ruby #{File.basename $0} config"
-    out.puts "  $ ruby #{File.basename $0} setup"
-    out.puts "  # ruby #{File.basename $0} install (may require root privilege)"
-    out.puts
-    out.puts 'Detailed Usage:'
-    out.puts "  ruby #{File.basename $0} <global option>"
-    out.puts "  ruby #{File.basename $0} [<global options>] <task> [<task options>]"
-
-    fmt = "  %-24s %s\n"
-    out.puts
-    out.puts 'Global options:'
-    out.printf fmt, '-q,--quiet',   'suppress message outputs'
-    out.printf fmt, '   --verbose', 'output messages verbosely'
-    out.printf fmt, '   --help',    'print this message'
-    out.printf fmt, '   --version', 'print version and quit'
-    out.printf fmt, '   --copyright',  'print copyright and quit'
-    out.puts
-    out.puts 'Tasks:'
-    TASKS.each do |name, desc|
-      out.printf fmt, name, desc
-    end
-
-    fmt = "  %-24s %s [%s]\n"
-    out.puts
-    out.puts 'Options for CONFIG or ALL:'
-    @config.each do |item|
-      out.printf fmt, item.help_opt, item.description, item.help_default
-    end
-    out.printf fmt, '--rbconfig=path', 'rbconfig.rb to load',"running ruby's"
-    out.puts
-    out.puts 'Options for INSTALL:'
-    out.printf fmt, '--no-harm', 'only display what to do if given', 'off'
-    out.printf fmt, '--prefix=path',  'install path prefix', ''
-    out.puts
-  end
-
-  #
-  # Task Handlers
-  #
-
-  def exec_config
-    @installer.exec_config
-    @config.save   # must be final
-  end
-
-  def exec_setup
-    @installer.exec_setup
-  end
-
-  def exec_install
-    @installer.exec_install
-  end
-
-  def exec_test
-    @installer.exec_test
-  end
-
-  def exec_show
-    @config.each do |i|
-      printf "%-20s %s\n", i.name, i.value if i.value?
-    end
-  end
-
-  def exec_clean
-    @installer.exec_clean
-  end
-
-  def exec_distclean
-    @installer.exec_distclean
-  end
-
-end   # class ToplevelInstaller
-
-
-class ToplevelInstallerMulti < ToplevelInstaller
-
-  include FileOperations
-
-  def initialize(ardir_root, config)
-    super
-    @packages = directories_of("#{@ardir}/packages")
-    raise 'no package exists' if @packages.empty?
-    @root_installer = Installer.new(@config, @ardir, File.expand_path('.'))
-  end
-
-  def run_metaconfigs
-    @config.load_script "#{@ardir}/metaconfig", self
-    @packages.each do |name|
-      @config.load_script "#{@ardir}/packages/#{name}/metaconfig"
-    end
-  end
-
-  attr_reader :packages
-
-  def packages=(list)
-    raise 'package list is empty' if list.empty?
-    list.each do |name|
-      raise "directory packages/#{name} does not exist"\
-              unless File.dir?("#{@ardir}/packages/#{name}")
-    end
-    @packages = list
-  end
-
-  def init_installers
-    @installers = {}
-    @packages.each do |pack|
-      @installers[pack] = Installer.new(@config,
-                                       "#{@ardir}/packages/#{pack}",
-                                       "packages/#{pack}")
-    end
-    with    = extract_selection(config('with'))
-    without = extract_selection(config('without'))
-    @selected = @installers.keys.select {|name|
-                  (with.empty? or with.include?(name)) \
-                      and not without.include?(name)
-                }
-  end
-
-  def extract_selection(list)
-    a = list.split(/,/)
-    a.each do |name|
-      setup_rb_error "no such package: #{name}"  unless @installers.key?(name)
-    end
-    a
-  end
-
-  def print_usage(f)
-    super
-    f.puts 'Inluded packages:'
-    f.puts '  ' + @packages.sort.join(' ')
-    f.puts
-  end
-
-  #
-  # Task Handlers
-  #
-
-  def exec_config
-    run_hook 'pre-config'
-    each_selected_installers {|inst| inst.exec_config }
-    run_hook 'post-config'
-    @config.save   # must be final
-  end
-
-  def exec_setup
-    run_hook 'pre-setup'
-    each_selected_installers {|inst| inst.exec_setup }
-    run_hook 'post-setup'
-  end
-
-  def exec_install
-    run_hook 'pre-install'
-    each_selected_installers {|inst| inst.exec_install }
-    run_hook 'post-install'
-  end
-
-  def exec_test
-    run_hook 'pre-test'
-    each_selected_installers {|inst| inst.exec_test }
-    run_hook 'post-test'
-  end
-
-  def exec_clean
-    rm_f @config.savefile
-    run_hook 'pre-clean'
-    each_selected_installers {|inst| inst.exec_clean }
-    run_hook 'post-clean'
-  end
-
-  def exec_distclean
-    rm_f @config.savefile
-    run_hook 'pre-distclean'
-    each_selected_installers {|inst| inst.exec_distclean }
-    run_hook 'post-distclean'
-  end
-
-  #
-  # lib
-  #
-
-  def each_selected_installers
-    Dir.mkdir 'packages' unless File.dir?('packages')
-    @selected.each do |pack|
-      $stderr.puts "Processing the package `#{pack}' ..." if verbose?
-      Dir.mkdir "packages/#{pack}" unless File.dir?("packages/#{pack}")
-      Dir.chdir "packages/#{pack}"
-      yield @installers[pack]
-      Dir.chdir '../..'
-    end
-  end
-
-  def run_hook(id)
-    @root_installer.run_hook id
-  end
-
-  # module FileOperations requires this
-  def verbose?
-    @config.verbose?
-  end
-
-  # module FileOperations requires this
-  def no_harm?
-    @config.no_harm?
-  end
-
-end   # class ToplevelInstallerMulti
-
-
-class Installer
-
-  FILETYPES = %w( bin lib ext data conf man )
-
-  include FileOperations
-  include HookScriptAPI
-
-  def initialize(config, srcroot, objroot)
-    @config = config
-    @srcdir = File.expand_path(srcroot)
-    @objdir = File.expand_path(objroot)
-    @currdir = '.'
-  end
-
-  def inspect
-    "#<#{self.class} #{File.basename(@srcdir)}>"
-  end
-
-  def noop(rel)
-  end
-
-  #
-  # Hook Script API base methods
-  #
-
-  def srcdir_root
-    @srcdir
-  end
-
-  def objdir_root
-    @objdir
-  end
-
-  def relpath
-    @currdir
-  end
-
-  #
-  # Config Access
-  #
-
-  # module FileOperations requires this
-  def verbose?
-    @config.verbose?
-  end
-
-  # module FileOperations requires this
-  def no_harm?
-    @config.no_harm?
-  end
-
-  def verbose_off
-    begin
-      save, @config.verbose = @config.verbose?, false
-      yield
-    ensure
-      @config.verbose = save
-    end
-  end
-
-  #
-  # TASK config
-  #
-
-  def exec_config
-    exec_task_traverse 'config'
-  end
-
-  alias config_dir_bin noop
-  alias config_dir_lib noop
-
-  def config_dir_ext(rel)
-    extconf if extdir?(curr_srcdir())
-  end
-
-  alias config_dir_data noop
-  alias config_dir_conf noop
-  alias config_dir_man noop
-
-  def extconf
-    ruby "#{curr_srcdir()}/extconf.rb", *@config.config_opt
-  end
-
-  #
-  # TASK setup
-  #
-
-  def exec_setup
-    exec_task_traverse 'setup'
-  end
-
-  def setup_dir_bin(rel)
-    files_of(curr_srcdir()).each do |fname|
-      update_shebang_line "#{curr_srcdir()}/#{fname}"
-    end
-  end
-
-  alias setup_dir_lib noop
-
-  def setup_dir_ext(rel)
-    make if extdir?(curr_srcdir())
-  end
-
-  alias setup_dir_data noop
-  alias setup_dir_conf noop
-  alias setup_dir_man noop
-
-  def update_shebang_line(path)
-    return if no_harm?
-    return if config('shebang') == 'never'
-    old = Shebang.load(path)
-    if old
-      $stderr.puts "warning: #{path}: Shebang line includes too many args.  It is not portable and your program may not work." if old.args.size > 1
-      new = new_shebang(old)
-      return if new.to_s == old.to_s
-    else
-      return unless config('shebang') == 'all'
-      new = Shebang.new(config('rubypath'))
-    end
-    $stderr.puts "updating shebang: #{File.basename(path)}" if verbose?
-    open_atomic_writer(path) {|output|
-      File.open(path, 'rb') {|f|
-        f.gets if old   # discard
-        output.puts new.to_s
-        output.print f.read
-      }
-    }
-  end
-
-  def new_shebang(old)
-    if /\Aruby/ =~ File.basename(old.cmd)
-      Shebang.new(config('rubypath'), old.args)
-    elsif File.basename(old.cmd) == 'env' and old.args.first == 'ruby'
-      Shebang.new(config('rubypath'), old.args[1..-1])
-    else
-      return old unless config('shebang') == 'all'
-      Shebang.new(config('rubypath'))
-    end
-  end
-
-  def open_atomic_writer(path, &block)
-    tmpfile = File.basename(path) + '.tmp'
-    begin
-      File.open(tmpfile, 'wb', &block)
-      File.rename tmpfile, File.basename(path)
-    ensure
-      File.unlink tmpfile if File.exist?(tmpfile)
-    end
-  end
-
-  class Shebang
-    def Shebang.load(path)
-      line = nil
-      File.open(path) {|f|
-        line = f.gets
-      }
-      return nil unless /\A#!/ =~ line
-      parse(line)
-    end
-
-    def Shebang.parse(line)
-      cmd, *args = *line.strip.sub(/\A\#!/, '').split(' ')
-      new(cmd, args)
-    end
-
-    def initialize(cmd, args = [])
-      @cmd = cmd
-      @args = args
-    end
-
-    attr_reader :cmd
-    attr_reader :args
-
-    def to_s
-      "#! #{@cmd}" + (@args.empty? ? '' : " #{@args.join(' ')}")
-    end
-  end
-
-  #
-  # TASK install
-  #
-
-  def exec_install
-    rm_f 'InstalledFiles'
-    exec_task_traverse 'install'
-  end
-
-  def install_dir_bin(rel)
-    install_files targetfiles(), "#{config('bindir')}/#{rel}", 0755
-  end
-
-  def install_dir_lib(rel)
-    install_files libfiles(), "#{config('rbdir')}/#{rel}", 0644
-  end
-
-  def install_dir_ext(rel)
-    return unless extdir?(curr_srcdir())
-    install_files rubyextentions('.'),
-                  "#{config('sodir')}/#{File.dirname(rel)}",
-                  0555
-  end
-
-  def install_dir_data(rel)
-    install_files targetfiles(), "#{config('datadir')}/#{rel}", 0644
-  end
-
-  def install_dir_conf(rel)
-    # FIXME: should not remove current config files
-    # (rename previous file to .old/.org)
-    install_files targetfiles(), "#{config('sysconfdir')}/#{rel}", 0644
-  end
-
-  def install_dir_man(rel)
-    install_files targetfiles(), "#{config('mandir')}/#{rel}", 0644
-  end
-
-  def install_files(list, dest, mode)
-    mkdir_p dest, @config.install_prefix
-    list.each do |fname|
-      install fname, dest, mode, @config.install_prefix
-    end
-  end
-
-  def libfiles
-    glob_reject(%w(*.y *.output), targetfiles())
-  end
-
-  def rubyextentions(dir)
-    ents = glob_select("*.#{@config.dllext}", targetfiles())
-    if ents.empty?
-      setup_rb_error "no ruby extention exists: 'ruby #{$0} setup' first"
-    end
-    ents
-  end
-
-  def targetfiles
-    mapdir(existfiles() - hookfiles())
-  end
-
-  def mapdir(ents)
-    ents.map {|ent|
-      if File.exist?(ent)
-      then ent                         # objdir
-      else "#{curr_srcdir()}/#{ent}"   # srcdir
-      end
-    }
-  end
-
-  # picked up many entries from cvs-1.11.1/src/ignore.c
-  JUNK_FILES = %w( 
-    core RCSLOG tags TAGS .make.state
-    .nse_depinfo #* .#* cvslog.* ,* .del-* *.olb
-    *~ *.old *.bak *.BAK *.orig *.rej _$* *$
-
-    *.org *.in .*
-  )
-
-  def existfiles
-    glob_reject(JUNK_FILES, (files_of(curr_srcdir()) | files_of('.')))
-  end
-
-  def hookfiles
-    %w( pre-%s post-%s pre-%s.rb post-%s.rb ).map {|fmt|
-      %w( config setup install clean ).map {|t| sprintf(fmt, t) }
-    }.flatten
-  end
-
-  def glob_select(pat, ents)
-    re = globs2re([pat])
-    ents.select {|ent| re =~ ent }
-  end
-
-  def glob_reject(pats, ents)
-    re = globs2re(pats)
-    ents.reject {|ent| re =~ ent }
-  end
-
-  GLOB2REGEX = {
-    '.' => '\.',
-    '$' => '\$',
-    '#' => '\#',
-    '*' => '.*'
-  }
-
-  def globs2re(pats)
-    /\A(?:#{
-      pats.map {|pat| pat.gsub(/[\.\$\#\*]/) {|ch| GLOB2REGEX[ch] } }.join('|')
-    })\z/
-  end
-
-  #
-  # TASK test
-  #
-
-  TESTDIR = 'test'
-
-  def exec_test
-    unless File.directory?('test')
-      $stderr.puts 'no test in this package' if verbose?
-      return
-    end
-    $stderr.puts 'Running tests...' if verbose?
-    begin
-      require 'test/unit'
-    rescue LoadError
-      setup_rb_error 'test/unit cannot loaded.  You need Ruby 1.8 or later to invoke this task.'
-    end
-    runner = Test::Unit::AutoRunner.new(true)
-    runner.to_run << TESTDIR
-    runner.run
-  end
-
-  #
-  # TASK clean
-  #
-
-  def exec_clean
-    exec_task_traverse 'clean'
-    rm_f @config.savefile
-    rm_f 'InstalledFiles'
-  end
-
-  alias clean_dir_bin noop
-  alias clean_dir_lib noop
-  alias clean_dir_data noop
-  alias clean_dir_conf noop
-  alias clean_dir_man noop
-
-  def clean_dir_ext(rel)
-    return unless extdir?(curr_srcdir())
-    make 'clean' if File.file?('Makefile')
-  end
-
-  #
-  # TASK distclean
-  #
-
-  def exec_distclean
-    exec_task_traverse 'distclean'
-    rm_f @config.savefile
-    rm_f 'InstalledFiles'
-  end
-
-  alias distclean_dir_bin noop
-  alias distclean_dir_lib noop
-
-  def distclean_dir_ext(rel)
-    return unless extdir?(curr_srcdir())
-    make 'distclean' if File.file?('Makefile')
-  end
-
-  alias distclean_dir_data noop
-  alias distclean_dir_conf noop
-  alias distclean_dir_man noop
-
-  #
-  # Traversing
-  #
-
-  def exec_task_traverse(task)
-    run_hook "pre-#{task}"
-    FILETYPES.each do |type|
-      if type == 'ext' and config('without-ext') == 'yes'
-        $stderr.puts 'skipping ext/* by user option' if verbose?
-        next
-      end
-      traverse task, type, "#{task}_dir_#{type}"
-    end
-    run_hook "post-#{task}"
-  end
-
-  def traverse(task, rel, mid)
-    dive_into(rel) {
-      run_hook "pre-#{task}"
-      __send__ mid, rel.sub(%r[\A.*?(?:/|\z)], '')
-      directories_of(curr_srcdir()).each do |d|
-        traverse task, "#{rel}/#{d}", mid
-      end
-      run_hook "post-#{task}"
-    }
-  end
-
-  def dive_into(rel)
-    return unless File.dir?("#{@srcdir}/#{rel}")
-
-    dir = File.basename(rel)
-    Dir.mkdir dir unless File.dir?(dir)
-    prevdir = Dir.pwd
-    Dir.chdir dir
-    $stderr.puts '---> ' + rel if verbose?
-    @currdir = rel
-    yield
-    Dir.chdir prevdir
-    $stderr.puts '<--- ' + rel if verbose?
-    @currdir = File.dirname(rel)
-  end
-
-  def run_hook(id)
-    path = [ "#{curr_srcdir()}/#{id}",
-             "#{curr_srcdir()}/#{id}.rb" ].detect {|cand| File.file?(cand) }
-    return unless path
-    begin
-      instance_eval File.read(path), path, 1
-    rescue
-      raise if $DEBUG
-      setup_rb_error "hook #{path} failed:\n" + $!.message
-    end
-  end
-
-end   # class Installer
-
-
-class SetupError < StandardError; end
-
-def setup_rb_error(msg)
-  raise SetupError, msg
-end
-
-if $0 == __FILE__
-  begin
-    ToplevelInstaller.invoke
-  rescue SetupError
-    raise if $DEBUG
-    $stderr.puts $!.message
-    $stderr.puts "Try 'ruby #{$0} --help' for detailed usage."
-    exit 1
-  end
-end
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/attic/test_run.rb b/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/attic/test_run.rb
deleted file mode 100644
index 37d83d5a5..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/attic/test_run.rb
+++ /dev/null
@@ -1,45 +0,0 @@
-require 'test/unit'
-require 'rcodetools/xmpfilter'
-require 'rcodetools/xmptestunitfilter'
-require 'rcodetools/completion'
-require 'rcodetools/doc'
-require 'rcodetools/options'
-require 'stringio'
-
-class TestRun < Test::Unit::TestCase
-  include Rcodetools
-  DIR = File.expand_path(File.dirname(__FILE__))
-
-  tests = {
-    :simple_annotation => {:klass => XMPFilter},
-    :unit_test         => {:klass => XMPTestUnitFilter},
-    :rspec             => {:klass => XMPRSpecFilter,    :interpreter     => "spec"},
-    :rspec_poetry      => {:klass => XMPRSpecFilter,    :interpreter     => "spec", :use_parentheses => false},
-    :no_warnings       => {:klass => XMPFilter,         :warnings        => false},
-    :bindings          => {:klass => XMPTestUnitFilter, :use_parentheses => false},
-    :unit_test_poetry  => {:klass => XMPTestUnitFilter, :use_parentheses => false},
-    :add_markers       => {:klass => XMPAddMarkers},
-    
-    :completion       => {:klass => XMPCompletionFilter,      :lineno => 1},
-    :completion_emacs => {:klass => XMPCompletionEmacsFilter, :lineno => 1},
-    :completion_emacs_icicles => {:klass => XMPCompletionEmacsIciclesFilter, :lineno => 1},
-    :completion_class_info => {:klass => XMPCompletionClassInfoFilter, :lineno => 1},
-    :completion_class_info_no_candidates => {:klass => XMPCompletionClassInfoFilter, :lineno => 1},
-    
-    :doc      => {:klass => XMPDocFilter,     :lineno => 1},
-    :refe     => {:klass => XMPReFeFilter,    :lineno => 1},
-    :ri       => {:klass => XMPRiFilter,      :lineno => 1},
-    :ri_emacs => {:klass => XMPRiEmacsFilter, :lineno => 1},
-    :ri_vim   => {:klass => XMPRiVimFilter,   :lineno => 1},
-    
-  }
-  tests.each_pair do |test, opts|
-    define_method("test_#{test}") do
-      inputfile = "#{DIR}/data/#{test}-input.rb"
-      outputfile = "#{DIR}/data/#{test}-output.rb"
-      sio = StringIO.new
-      sio.puts opts[:klass].run(File.read(inputfile), DEFAULT_OPTIONS.merge(opts))
-      assert_equal(File.read(outputfile), sio.string)
-    end
-  end 
-end
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/add_markers-input.rb b/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/add_markers-input.rb
deleted file mode 100644
index 33a508e45..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/add_markers-input.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-1+1
-2+3
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/add_markers-output.rb b/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/add_markers-output.rb
deleted file mode 100644
index fe8fd61b4..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/add_markers-output.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-1+1                                                # =>
-2+3                                                # =>
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/bindings-input.rb b/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/bindings-input.rb
deleted file mode 100644
index 90e97e27a..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/bindings-input.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-
-require 'test/unit'
-
-class TestFoo < Test::Unit::TestCase
-  def setup
-    @o = []
-  end
-
-  def test_foo
-    a = 1
-    b = a
-    b                                              # =>
-  end
-
-  def test_arr
-    last = 1
-    @o << last
-    @o.last                                        # =>
-  end
-
-  def test_bar
-    a = b = c = 1
-    d = a
-    d                                              # =>
-  end
-end
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/bindings-output.rb b/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/bindings-output.rb
deleted file mode 100644
index cbea3c07c..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/bindings-output.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-
-require 'test/unit'
-
-class TestFoo < Test::Unit::TestCase
-  def setup
-    @o = []
-  end
-
-  def test_foo
-    a = 1
-    b = a
-    assert_equal a, b
-    assert_equal 1, b
-  end
-
-  def test_arr
-    last = 1
-    @o << last
-    assert_equal last, @o.last
-    assert_equal 1, @o.last
-  end
-
-  def test_bar
-    a = b = c = 1
-    d = a
-    assert_equal a, d
-    assert_equal b, d
-    assert_equal c, d
-    assert_equal 1, d
-  end
-end
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/completion-input.rb b/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/completion-input.rb
deleted file mode 100644
index 2dcaa3f08..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/completion-input.rb
+++ /dev/null
@@ -1 +0,0 @@
-Array.new(3).uni
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/completion-output.rb b/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/completion-output.rb
deleted file mode 100644
index 9546ff3ac..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/completion-output.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-uniq
-uniq!
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/completion_class_info-input.rb b/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/completion_class_info-input.rb
deleted file mode 100644
index 6ea236464..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/completion_class_info-input.rb
+++ /dev/null
@@ -1 +0,0 @@
-Array.new(3).s
\ No newline at end of file
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/completion_class_info-output.rb b/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/completion_class_info-output.rb
deleted file mode 100644
index 8c604b3c0..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/completion_class_info-output.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-select	Array#select
-send	Object#send
-shift	Array#shift
-singleton_methods	Object#singleton_methods
-size	Array#size
-slice	Array#slice
-slice!	Array#slice!
-sort	Array#sort
-sort!	Array#sort!
-sort_by	Enumerable#sort_by
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/completion_class_info_no_candidates-input.rb b/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/completion_class_info_no_candidates-input.rb
deleted file mode 100644
index 4666cc05c..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/completion_class_info_no_candidates-input.rb
+++ /dev/null
@@ -1 +0,0 @@
-Array.new(3).nonexisten
\ No newline at end of file
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/completion_class_info_no_candidates-output.rb b/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/completion_class_info_no_candidates-output.rb
deleted file mode 100644
index 8b1378917..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/completion_class_info_no_candidates-output.rb
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/completion_detect_rbtest-input.rb b/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/completion_detect_rbtest-input.rb
deleted file mode 100755
index c4d92ca63..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/completion_detect_rbtest-input.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env ruby
-=begin test_bar
-assert_equal "BAR", bar("bar")
-=end
-def bar(s)
-  s.upca
-end
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/completion_detect_rbtest-output.rb b/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/completion_detect_rbtest-output.rb
deleted file mode 100644
index c3d421a75..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/completion_detect_rbtest-output.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-upcase
-upcase!
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/completion_detect_rbtest2-input.rb b/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/completion_detect_rbtest2-input.rb
deleted file mode 100644
index 2dcaa3f08..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/completion_detect_rbtest2-input.rb
+++ /dev/null
@@ -1 +0,0 @@
-Array.new(3).uni
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/completion_detect_rbtest2-output.rb b/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/completion_detect_rbtest2-output.rb
deleted file mode 100644
index 9546ff3ac..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/completion_detect_rbtest2-output.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-uniq
-uniq!
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/completion_emacs-input.rb b/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/completion_emacs-input.rb
deleted file mode 100644
index 2dcaa3f08..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/completion_emacs-input.rb
+++ /dev/null
@@ -1 +0,0 @@
-Array.new(3).uni
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/completion_emacs-output.rb b/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/completion_emacs-output.rb
deleted file mode 100644
index c83366a11..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/completion_emacs-output.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-(progn
-(setq rct-method-completion-table '(("uniq") ("uniq!") ))
-(setq alist '(("uniq\t[Array#uniq]") ("uniq!\t[Array#uniq!]") ))
-(setq pattern "uni")
-(try-completion pattern rct-method-completion-table nil)
-)
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/completion_emacs_icicles-input.rb b/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/completion_emacs_icicles-input.rb
deleted file mode 100644
index aa062b7f9..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/completion_emacs_icicles-input.rb
+++ /dev/null
@@ -1 +0,0 @@
-1.div
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/completion_emacs_icicles-output.rb b/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/completion_emacs_icicles-output.rb
deleted file mode 100644
index e4747ae36..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/completion_emacs_icicles-output.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-(progn
-(setq rct-method-completion-table '(("div\t[Fixnum#div]") ("divmod\t[Fixnum#divmod]") ))
-(setq alist '(("div" . "Fixnum#div")("divmod" . "Fixnum#divmod")))
-(setq pattern "div")
-(setq klass "Fixnum")
-)
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/completion_in_method-input.rb b/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/completion_in_method-input.rb
deleted file mode 100644
index 164408012..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/completion_in_method-input.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-def fooz
-  [].lengt
-end
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/completion_in_method-output.rb b/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/completion_in_method-output.rb
deleted file mode 100644
index 7f5e3b64d..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/completion_in_method-output.rb
+++ /dev/null
@@ -1 +0,0 @@
-length
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/completion_in_method-test.rb b/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/completion_in_method-test.rb
deleted file mode 100644
index 1edef979e..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/completion_in_method-test.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-require 'test/unit'
-class TestFooz < Test::Unit::TestCase
-  def test_fooz
-    assert_equal(0, fooz)
-  end
-end
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/completion_rbtest-input.rb b/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/completion_rbtest-input.rb
deleted file mode 100755
index c4d92ca63..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/completion_rbtest-input.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env ruby
-=begin test_bar
-assert_equal "BAR", bar("bar")
-=end
-def bar(s)
-  s.upca
-end
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/completion_rbtest-output.rb b/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/completion_rbtest-output.rb
deleted file mode 100644
index c3d421a75..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/completion_rbtest-output.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-upcase
-upcase!
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/doc-input.rb b/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/doc-input.rb
deleted file mode 100644
index 624aca755..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/doc-input.rb
+++ /dev/null
@@ -1 +0,0 @@
-[].length
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/doc-output.rb b/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/doc-output.rb
deleted file mode 100644
index ca542dbcc..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/doc-output.rb
+++ /dev/null
@@ -1 +0,0 @@
-Array#length
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/doc_detect_rbtest-input.rb b/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/doc_detect_rbtest-input.rb
deleted file mode 100644
index 624aca755..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/doc_detect_rbtest-input.rb
+++ /dev/null
@@ -1 +0,0 @@
-[].length
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/doc_detect_rbtest-output.rb b/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/doc_detect_rbtest-output.rb
deleted file mode 100644
index ca542dbcc..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/doc_detect_rbtest-output.rb
+++ /dev/null
@@ -1 +0,0 @@
-Array#length
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/doc_detect_rbtest2-input.rb b/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/doc_detect_rbtest2-input.rb
deleted file mode 100755
index bf97ffe15..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/doc_detect_rbtest2-input.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env ruby
-=begin test_bar
-assert_equal "BAR", bar("bar")
-=end
-def bar(s)
-  s.upcase
-end
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/doc_detect_rbtest2-output.rb b/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/doc_detect_rbtest2-output.rb
deleted file mode 100644
index 579185024..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/doc_detect_rbtest2-output.rb
+++ /dev/null
@@ -1 +0,0 @@
-String#upcase
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/doc_rbtest-input.rb b/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/doc_rbtest-input.rb
deleted file mode 100755
index bf97ffe15..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/doc_rbtest-input.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env ruby
-=begin test_bar
-assert_equal "BAR", bar("bar")
-=end
-def bar(s)
-  s.upcase
-end
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/doc_rbtest-output.rb b/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/doc_rbtest-output.rb
deleted file mode 100644
index 579185024..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/doc_rbtest-output.rb
+++ /dev/null
@@ -1 +0,0 @@
-String#upcase
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/no_warnings-input.rb b/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/no_warnings-input.rb
deleted file mode 100644
index 514e18c0d..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/no_warnings-input.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-A = 1
-A = 1
-p (1)
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/no_warnings-output.rb b/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/no_warnings-output.rb
deleted file mode 100644
index 27a723858..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/no_warnings-output.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-A = 1
-A = 1
-p (1)
-# >> 1
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/refe-input.rb b/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/refe-input.rb
deleted file mode 100644
index 624aca755..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/refe-input.rb
+++ /dev/null
@@ -1 +0,0 @@
-[].length
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/refe-output.rb b/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/refe-output.rb
deleted file mode 100644
index 8653c3d4b..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/refe-output.rb
+++ /dev/null
@@ -1 +0,0 @@
-refe 'Array#length'
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/ri-input.rb b/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/ri-input.rb
deleted file mode 100644
index 624aca755..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/ri-input.rb
+++ /dev/null
@@ -1 +0,0 @@
-[].length
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/ri-output.rb b/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/ri-output.rb
deleted file mode 100644
index f1ba49e61..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/ri-output.rb
+++ /dev/null
@@ -1 +0,0 @@
-ri 'Array#length'
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/ri_emacs-input.rb b/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/ri_emacs-input.rb
deleted file mode 100644
index 624aca755..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/ri_emacs-input.rb
+++ /dev/null
@@ -1 +0,0 @@
-[].length
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/ri_emacs-output.rb b/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/ri_emacs-output.rb
deleted file mode 100644
index 5f7389fb3..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/ri_emacs-output.rb
+++ /dev/null
@@ -1 +0,0 @@
-(rct-find-tag-or-ri "Array#length")
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/ri_vim-input.rb b/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/ri_vim-input.rb
deleted file mode 100644
index 624aca755..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/ri_vim-input.rb
+++ /dev/null
@@ -1 +0,0 @@
-[].length
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/ri_vim-output.rb b/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/ri_vim-output.rb
deleted file mode 100644
index 8e71a9a5c..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/ri_vim-output.rb
+++ /dev/null
@@ -1 +0,0 @@
-call RCT_find_tag_or_ri("Array#length")
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/rspec-input.rb b/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/rspec-input.rb
deleted file mode 100644
index c57b23c47..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/rspec-input.rb
+++ /dev/null
@@ -1,48 +0,0 @@
-
-class X
-  Y = Struct.new(:a)
-  def foo(b); b ? Y.new(2) : 2 end
-  def bar; raise "No good" end
-  def baz; nil end
-  def fubar(x); x ** 2.0 + 1 end
-  def babar; [1,2] end
-  A = 1
-  A = 1
-end
-
-
-describe "xmpfilter's expectation expansion" do
-  before do
-    @o = X.new
-  end
-
-  it "should expand should == expectations" do
-    @o.foo(true)   # =>
-    @o.foo(true).a # =>
-    @o.foo(false)  # =>
-  end
-  
-  it "should expand should raise_error expectations" do
-    @o.bar         # =>
-  end
-
-  it "should expand should be_nil expectations" do
-    @o.baz         # =>
-  end
-
-  it "should expand correct expectations for complex values" do
-    @o.babar       # =>
-  end
-
-  it "should expand should be_close expectations" do
-    @o.fubar(10)   # =>
-  end
-end
-
-describe "xmpfilter's automagic binding detection" do
-  it "should expand should == expectations" do
-    a = b = c = 1
-    d = a
-    d                                              # =>
-  end
-end
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/rspec-output.rb b/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/rspec-output.rb
deleted file mode 100644
index 00abb887b..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/rspec-output.rb
+++ /dev/null
@@ -1,52 +0,0 @@
-
-class X
-  Y = Struct.new(:a)
-  def foo(b); b ? Y.new(2) : 2 end
-  def bar; raise "No good" end
-  def baz; nil end
-  def fubar(x); x ** 2.0 + 1 end
-  def babar; [1,2] end
-  A = 1
-  A = 1 # !> already initialized constant A
-end
-
-
-describe "xmpfilter's expectation expansion" do
-  before do
-    @o = X.new
-  end
-
-  it "should expand should == expectations" do
-    (@o.foo(true)).should be_a_kind_of(X::Y)
-    (@o.foo(true).inspect).should == ("#<struct X::Y a=2>")
-    (@o.foo(true).a).should == (2)
-    (@o.foo(false)).should == (2)
-  end
-  
-  it "should expand should raise_error expectations" do
-    lambda{@o.bar}.should raise_error(RuntimeError)
-  end
-
-  it "should expand should be_nil expectations" do
-    (@o.baz).should be_nil
-  end
-
-  it "should expand correct expectations for complex values" do
-    (@o.babar).should == ([1, 2])
-  end
-
-  it "should expand should be_close expectations" do
-    (@o.fubar(10)).should be_close(101.0, 0.0001)
-  end
-end
-
-describe "xmpfilter's automagic binding detection" do
-  it "should expand should == expectations" do
-    a = b = c = 1
-    d = a
-    (d).should == (a)
-    (d).should == (b)
-    (d).should == (c)
-    (d).should == (1)
-  end
-end
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/rspec_poetry-input.rb b/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/rspec_poetry-input.rb
deleted file mode 100644
index c57b23c47..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/rspec_poetry-input.rb
+++ /dev/null
@@ -1,48 +0,0 @@
-
-class X
-  Y = Struct.new(:a)
-  def foo(b); b ? Y.new(2) : 2 end
-  def bar; raise "No good" end
-  def baz; nil end
-  def fubar(x); x ** 2.0 + 1 end
-  def babar; [1,2] end
-  A = 1
-  A = 1
-end
-
-
-describe "xmpfilter's expectation expansion" do
-  before do
-    @o = X.new
-  end
-
-  it "should expand should == expectations" do
-    @o.foo(true)   # =>
-    @o.foo(true).a # =>
-    @o.foo(false)  # =>
-  end
-  
-  it "should expand should raise_error expectations" do
-    @o.bar         # =>
-  end
-
-  it "should expand should be_nil expectations" do
-    @o.baz         # =>
-  end
-
-  it "should expand correct expectations for complex values" do
-    @o.babar       # =>
-  end
-
-  it "should expand should be_close expectations" do
-    @o.fubar(10)   # =>
-  end
-end
-
-describe "xmpfilter's automagic binding detection" do
-  it "should expand should == expectations" do
-    a = b = c = 1
-    d = a
-    d                                              # =>
-  end
-end
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/rspec_poetry-output.rb b/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/rspec_poetry-output.rb
deleted file mode 100644
index 907b30535..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/rspec_poetry-output.rb
+++ /dev/null
@@ -1,52 +0,0 @@
-
-class X
-  Y = Struct.new(:a)
-  def foo(b); b ? Y.new(2) : 2 end
-  def bar; raise "No good" end
-  def baz; nil end
-  def fubar(x); x ** 2.0 + 1 end
-  def babar; [1,2] end
-  A = 1
-  A = 1 # !> already initialized constant A
-end
-
-
-describe "xmpfilter's expectation expansion" do
-  before do
-    @o = X.new
-  end
-
-  it "should expand should == expectations" do
-    @o.foo(true).should be_a_kind_of(X::Y)
-    @o.foo(true).inspect.should == "#<struct X::Y a=2>"
-    @o.foo(true).a.should == 2
-    @o.foo(false).should == 2
-  end
-  
-  it "should expand should raise_error expectations" do
-    lambda{@o.bar}.should raise_error(RuntimeError)
-  end
-
-  it "should expand should be_nil expectations" do
-    @o.baz.should be_nil
-  end
-
-  it "should expand correct expectations for complex values" do
-    @o.babar.should == [1, 2]
-  end
-
-  it "should expand should be_close expectations" do
-    @o.fubar(10).should be_close(101.0, 0.0001)
-  end
-end
-
-describe "xmpfilter's automagic binding detection" do
-  it "should expand should == expectations" do
-    a = b = c = 1
-    d = a
-    d.should == a
-    d.should == b
-    d.should == c
-    d.should == 1
-  end
-end
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/simple_annotation-input.rb b/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/simple_annotation-input.rb
deleted file mode 100644
index e4eb38504..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/simple_annotation-input.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-
-a = 1
-10.times do |i|
-  i ** 2                                           # =>
-  a += i
-end
-A = 1
-A = 1
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/simple_annotation-output.rb b/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/simple_annotation-output.rb
deleted file mode 100644
index 41cd4c0cd..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/simple_annotation-output.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-
-a = 1
-10.times do |i|
-  i ** 2                                           # => 0, 1, 4, 9, 16, 25, 36, 49, 64, 81
-  a += i
-end
-A = 1
-A = 1 # !> already initialized constant A
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/unit_test-input.rb b/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/unit_test-input.rb
deleted file mode 100644
index d9d02cdcd..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/unit_test-input.rb
+++ /dev/null
@@ -1,50 +0,0 @@
-
-class X
-  Y = Struct.new(:a)
-  def foo(b); b ? Y.new(2) : 2 end
-  def bar; raise "No good" end
-  def baz; nil end
-  def fubar(x); x ** 2.0 + 1 end
-  def babar; [1,2] end
-  A = 1
-  A = 1
-  def difftype() [1, "s"] end
-end
-
-
-require 'test/unit'
-class Test_X < Test::Unit::TestCase
-  def setup
-    @o = X.new
-  end
-
-  def test_foo
-    @o.foo(true)   # =>
-    @o.foo(true).a # =>
-    @o.foo(false)  # =>
-  end
-  
-  def test_bar
-    @o.bar         # =>
-  end
-
-  def test_baz
-    @o.baz         # =>
-  end
-
-  def test_babar
-    @o.babar       # =>
-  end
-
-  def test_fubar
-    @o.fubar(10)   # =>
-  end
-
-  def test_difftype
-    for x in @o.difftype
-      x            # =>
-    end
-  end
-
-end
-
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/unit_test-output.rb b/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/unit_test-output.rb
deleted file mode 100644
index 49f4e6314..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/unit_test-output.rb
+++ /dev/null
@@ -1,52 +0,0 @@
-
-class X
-  Y = Struct.new(:a)
-  def foo(b); b ? Y.new(2) : 2 end
-  def bar; raise "No good" end
-  def baz; nil end
-  def fubar(x); x ** 2.0 + 1 end
-  def babar; [1,2] end
-  A = 1
-  A = 1 # !> already initialized constant A
-  def difftype() [1, "s"] end
-end
-
-
-require 'test/unit'
-class Test_X < Test::Unit::TestCase
-  def setup
-    @o = X.new
-  end
-
-  def test_foo
-    assert_kind_of(X::Y, @o.foo(true))
-    assert_equal("#<struct X::Y a=2>", @o.foo(true).inspect)
-    assert_equal(2, @o.foo(true).a)
-    assert_equal(2, @o.foo(false))
-  end
-  
-  def test_bar
-    assert_raise(RuntimeError){@o.bar}
-  end
-
-  def test_baz
-    assert_nil(@o.baz)
-  end
-
-  def test_babar
-    assert_equal([1, 2], @o.babar)
-  end
-
-  def test_fubar
-    assert_in_delta(101.0, @o.fubar(10), 0.0001)
-  end
-
-  def test_difftype
-    for x in @o.difftype
-      #xmpfilter: WARNING!! extra values ignored
-      assert_equal(1, x)
-    end
-  end
-
-end
-
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/unit_test_detect_rbtest-input.rb b/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/unit_test_detect_rbtest-input.rb
deleted file mode 100644
index d9d02cdcd..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/unit_test_detect_rbtest-input.rb
+++ /dev/null
@@ -1,50 +0,0 @@
-
-class X
-  Y = Struct.new(:a)
-  def foo(b); b ? Y.new(2) : 2 end
-  def bar; raise "No good" end
-  def baz; nil end
-  def fubar(x); x ** 2.0 + 1 end
-  def babar; [1,2] end
-  A = 1
-  A = 1
-  def difftype() [1, "s"] end
-end
-
-
-require 'test/unit'
-class Test_X < Test::Unit::TestCase
-  def setup
-    @o = X.new
-  end
-
-  def test_foo
-    @o.foo(true)   # =>
-    @o.foo(true).a # =>
-    @o.foo(false)  # =>
-  end
-  
-  def test_bar
-    @o.bar         # =>
-  end
-
-  def test_baz
-    @o.baz         # =>
-  end
-
-  def test_babar
-    @o.babar       # =>
-  end
-
-  def test_fubar
-    @o.fubar(10)   # =>
-  end
-
-  def test_difftype
-    for x in @o.difftype
-      x            # =>
-    end
-  end
-
-end
-
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/unit_test_detect_rbtest-output.rb b/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/unit_test_detect_rbtest-output.rb
deleted file mode 100644
index 49f4e6314..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/unit_test_detect_rbtest-output.rb
+++ /dev/null
@@ -1,52 +0,0 @@
-
-class X
-  Y = Struct.new(:a)
-  def foo(b); b ? Y.new(2) : 2 end
-  def bar; raise "No good" end
-  def baz; nil end
-  def fubar(x); x ** 2.0 + 1 end
-  def babar; [1,2] end
-  A = 1
-  A = 1 # !> already initialized constant A
-  def difftype() [1, "s"] end
-end
-
-
-require 'test/unit'
-class Test_X < Test::Unit::TestCase
-  def setup
-    @o = X.new
-  end
-
-  def test_foo
-    assert_kind_of(X::Y, @o.foo(true))
-    assert_equal("#<struct X::Y a=2>", @o.foo(true).inspect)
-    assert_equal(2, @o.foo(true).a)
-    assert_equal(2, @o.foo(false))
-  end
-  
-  def test_bar
-    assert_raise(RuntimeError){@o.bar}
-  end
-
-  def test_baz
-    assert_nil(@o.baz)
-  end
-
-  def test_babar
-    assert_equal([1, 2], @o.babar)
-  end
-
-  def test_fubar
-    assert_in_delta(101.0, @o.fubar(10), 0.0001)
-  end
-
-  def test_difftype
-    for x in @o.difftype
-      #xmpfilter: WARNING!! extra values ignored
-      assert_equal(1, x)
-    end
-  end
-
-end
-
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/unit_test_detect_rbtest2-input.rb b/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/unit_test_detect_rbtest2-input.rb
deleted file mode 100644
index afb6ebba2..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/unit_test_detect_rbtest2-input.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-=begin test_bar
-bar("bar")    # =>
-=end
-def bar(s)
-  s.upcase
-end
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/unit_test_detect_rbtest2-output.rb b/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/unit_test_detect_rbtest2-output.rb
deleted file mode 100644
index 67ac1d924..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/unit_test_detect_rbtest2-output.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-=begin test_bar
-assert_equal("BAR", bar("bar"))
-=end
-def bar(s)
-  s.upcase
-end
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/unit_test_poetry-input.rb b/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/unit_test_poetry-input.rb
deleted file mode 100644
index d9d02cdcd..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/unit_test_poetry-input.rb
+++ /dev/null
@@ -1,50 +0,0 @@
-
-class X
-  Y = Struct.new(:a)
-  def foo(b); b ? Y.new(2) : 2 end
-  def bar; raise "No good" end
-  def baz; nil end
-  def fubar(x); x ** 2.0 + 1 end
-  def babar; [1,2] end
-  A = 1
-  A = 1
-  def difftype() [1, "s"] end
-end
-
-
-require 'test/unit'
-class Test_X < Test::Unit::TestCase
-  def setup
-    @o = X.new
-  end
-
-  def test_foo
-    @o.foo(true)   # =>
-    @o.foo(true).a # =>
-    @o.foo(false)  # =>
-  end
-  
-  def test_bar
-    @o.bar         # =>
-  end
-
-  def test_baz
-    @o.baz         # =>
-  end
-
-  def test_babar
-    @o.babar       # =>
-  end
-
-  def test_fubar
-    @o.fubar(10)   # =>
-  end
-
-  def test_difftype
-    for x in @o.difftype
-      x            # =>
-    end
-  end
-
-end
-
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/unit_test_poetry-output.rb b/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/unit_test_poetry-output.rb
deleted file mode 100644
index 6278c2553..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/unit_test_poetry-output.rb
+++ /dev/null
@@ -1,52 +0,0 @@
-
-class X
-  Y = Struct.new(:a)
-  def foo(b); b ? Y.new(2) : 2 end
-  def bar; raise "No good" end
-  def baz; nil end
-  def fubar(x); x ** 2.0 + 1 end
-  def babar; [1,2] end
-  A = 1
-  A = 1 # !> already initialized constant A
-  def difftype() [1, "s"] end
-end
-
-
-require 'test/unit'
-class Test_X < Test::Unit::TestCase
-  def setup
-    @o = X.new
-  end
-
-  def test_foo
-    assert_kind_of X::Y, @o.foo(true) 
-    assert_equal "#<struct X::Y a=2>", @o.foo(true).inspect
-    assert_equal 2, @o.foo(true).a
-    assert_equal 2, @o.foo(false)
-  end
-  
-  def test_bar
-    assert_raise(RuntimeError){@o.bar}
-  end
-
-  def test_baz
-    assert_nil @o.baz
-  end
-
-  def test_babar
-    assert_equal [1, 2], @o.babar
-  end
-
-  def test_fubar
-    assert_in_delta 101.0, @o.fubar(10), 0.0001
-  end
-
-  def test_difftype
-    for x in @o.difftype
-      #xmpfilter: WARNING!! extra values ignored
-      assert_equal 1, x
-    end
-  end
-
-end
-
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/unit_test_rbtest-input.rb b/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/unit_test_rbtest-input.rb
deleted file mode 100644
index afb6ebba2..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/unit_test_rbtest-input.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-=begin test_bar
-bar("bar")    # =>
-=end
-def bar(s)
-  s.upcase
-end
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/unit_test_rbtest-output.rb b/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/unit_test_rbtest-output.rb
deleted file mode 100644
index 67ac1d924..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/attic/unit_test_rbtest-output.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-=begin test_bar
-assert_equal("BAR", bar("bar"))
-=end
-def bar(s)
-  s.upcase
-end
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/method_analyzer-data.rb b/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/method_analyzer-data.rb
deleted file mode 100644
index 82fca088e..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/method_analyzer-data.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-
-class A
-  def A.foo
-    1
-  end
-
-  def a
-    1+1
-  end
-end
-class B < A
-  def initialize
-  end
-  attr_accessor :bb
-  
-  def b
-    "a".length
-  end
-end
-tm = Time.now
-[tm.year, tm.month, tm.day] << 0
-a = A.new
-a.a
-b = B.new
-b.a
-b.b
-[b.a,b.b]
-z = b.a + b.b
-A.foo
-B.foo
-b.bb=1
-b.bb
-
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/method_args.data.rb b/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/method_args.data.rb
deleted file mode 100644
index b95fa8337..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/method_args.data.rb
+++ /dev/null
@@ -1,106 +0,0 @@
-# method_args.data.rb
-class FixedArgsMethods
-  def self.singleton(a1) end
-  def initialize(arg) end
-  def f(a1) end
-  def b(a1,&block) end
-  define_method(:defmethod) {|a1|}
-  attr_accessor :by_attr_accessor
-  attr :by_attr_false
-  attr :by_attr_true, true
-  attr_reader :by_attr_reader_1, :by_attr_reader_2
-  attr_writer :by_attr_writer
-  def private_meth(x) end
-  private :private_meth
-  class << self
-    attr_accessor :singleton_attr_accessor
-    define_method(:singleton_defmethod){|a2|}
-  end
-end
-
-module VariableArgsMethods
-  def s(a1,*splat) end
-  def sb(a1,*splat, &block) end
-  def d(a1,default=nil) end
-  def ds(a1,default=nil,*splat) end
-  def dsb(a1,default=nil,*splat,&block) end
-  def db(a1,default=nil,&block) end
-end
-
-class Fixnum
-  def method_in_Fixnum(arg1, arg2) end
-  def self.singleton_method_in_Fixnum(arg1, arg2) end
-end
-class Bignum
-  def method_in_Bignum(arg1, arg2) end
-end
-class Float
-  def method_in_Float(arg1, arg2) end
-end
-class Symbol
-  def method_in_Symbol(arg1, arg2) end
-end
-class Binding
-  def method_in_Binding(arg1, arg2) end
-end
-class UnboundMethod
-  def method_in_UnboundMethod(arg1, arg2) end
-end
-class Method
-  def method_in_Method(arg1, arg2) end
-end
-class Proc
-  def method_in_Proc(arg1, arg2) end
-end
-class Continuation
-  def method_in_Continuation(arg1, arg2) end
-end
-class Thread
-  def method_in_Thread(arg1, arg2) end
-end
-# FIXME mysterious
-# class FalseClass
-#   def method_in_FalseClass(arg1, arg2) end
-# end
-class TrueClass
-  def method_in_TrueClass(arg1, arg2) end
-end
-class NilClass
-  def method_in_NilClass(arg1, arg2) end
-end
-class Struct
-  def method_in_Struct(arg1, arg2) end
-end
-
-require 'digest'
-class Digest::Base
-  def method_in_Digest_Base(arg1, arg2) end
-end
-
-class AnAbstractClass
-  $__method_args_off = true
-  def self.allocate
-    raise NotImplementedError, "#{self} is an abstract class."
-  end
-  $__method_args_off = false
-
-  def method_in_AnAbstractClass(arg1, arg2)
-  end
-
-end
-
-class AClass
-  include VariableArgsMethods
-  extend VariableArgsMethods
-end
-
-class ASubClass < AClass
-end
-
-StructA = Struct.new :a, :b
-class SubclassOfStructA < StructA
-  attr :method_in_b
-end
-class StructSubclass < Struct.new(:c)
-  attr :method_in_c
-end
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/rct-complete-TDC/completion_in_method__testmethod.taf b/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/rct-complete-TDC/completion_in_method__testmethod.taf
deleted file mode 100644
index dfa125677..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/rct-complete-TDC/completion_in_method__testmethod.taf
+++ /dev/null
@@ -1,17 +0,0 @@
-==========
-completion_in_method__testmethod
-==========
-rct-complete --filename %s --line 2 -t %s@test_fooz
-==========
-def fooz
-  [].lengt
-end
-==========
-length
-==========
-require 'test/unit'
-class TestFooz < Test::Unit::TestCase
-  def test_fooz
-    assert_equal(0, fooz)
-  end
-end
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/rct-complete-TDC/completion_in_method__testscript.taf b/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/rct-complete-TDC/completion_in_method__testscript.taf
deleted file mode 100644
index f2de8add1..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/rct-complete-TDC/completion_in_method__testscript.taf
+++ /dev/null
@@ -1,17 +0,0 @@
-==========
-completion_in_method__testscript
-==========
-rct-complete --filename %s --line 2 -t %s
-==========
-def fooz
-  [].lengt
-end
-==========
-length
-==========
-require 'test/unit'
-class TestFooz < Test::Unit::TestCase
-  def test_fooz
-    assert_equal(0, fooz)
-  end
-end
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/rct-complete-TDC/completion_in_method__wrong_testmethod.taf b/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/rct-complete-TDC/completion_in_method__wrong_testmethod.taf
deleted file mode 100644
index 989c1f492..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/rct-complete-TDC/completion_in_method__wrong_testmethod.taf
+++ /dev/null
@@ -1,17 +0,0 @@
-==========
-completion_in_method__wrong_testmethod
-==========
-rct-complete --filename %s --line 2 -t %s@test_NOT_FOUND 
-==========
-def fooz
-  [].lengt
-end
-==========
-
-==========
-require 'test/unit'
-class TestFooz < Test::Unit::TestCase
-  def test_fooz
-    assert_equal(0, fooz)
-  end
-end
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/rct-complete/completion.taf b/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/rct-complete/completion.taf
deleted file mode 100644
index de08a22cf..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/rct-complete/completion.taf
+++ /dev/null
@@ -1,9 +0,0 @@
-==========
-completion
-==========
-rct-complete -C --line=1
-==========
-Array.new(3).uni
-==========
-uniq
-uniq!
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/rct-complete/completion_class_info.taf b/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/rct-complete/completion_class_info.taf
deleted file mode 100644
index 40d82fc9f..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/rct-complete/completion_class_info.taf
+++ /dev/null
@@ -1,9 +0,0 @@
-==========
-completion_class_info
-==========
-rct-complete --completion-class-info --line=1
-==========
-Array.new(3).sl
-==========
-slice	Array#slice
-slice!	Array#slice!
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/rct-complete/completion_class_info_no_candidates.taf b/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/rct-complete/completion_class_info_no_candidates.taf
deleted file mode 100644
index f4e8959bc..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/rct-complete/completion_class_info_no_candidates.taf
+++ /dev/null
@@ -1,8 +0,0 @@
-==========
-completion_class_info_no_candidates
-==========
-rct-complete --completion-class-info --line=1
-==========
-Array.new(3).nonexisten
-==========
-
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/rct-complete/completion_detect_rbtest.taf b/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/rct-complete/completion_detect_rbtest.taf
deleted file mode 100644
index e5405568d..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/rct-complete/completion_detect_rbtest.taf
+++ /dev/null
@@ -1,15 +0,0 @@
-==========
-completion_detect_rbtest
-==========
-rct-complete --detect-rbtest --line=6
-==========
-#!/usr/bin/env ruby
-=begin test_bar
-assert_equal "BAR", bar("bar")
-=end
-def bar(s)
-  s.upca
-end
-==========
-upcase
-upcase!
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/rct-complete/completion_detect_rbtest2.taf b/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/rct-complete/completion_detect_rbtest2.taf
deleted file mode 100644
index 49eaf171c..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/rct-complete/completion_detect_rbtest2.taf
+++ /dev/null
@@ -1,9 +0,0 @@
-==========
-completion_detect_rbtest2
-==========
-rct-complete --detect-rbtest --line=1
-==========
-Array.new(3).uni
-==========
-uniq
-uniq!
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/rct-complete/completion_emacs.taf b/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/rct-complete/completion_emacs.taf
deleted file mode 100644
index 9282ad09d..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/rct-complete/completion_emacs.taf
+++ /dev/null
@@ -1,13 +0,0 @@
-==========
-completion_emacs
-==========
-rct-complete --completion-emacs --line=1
-==========
-Array.new(3).uni
-==========
-(progn
-(setq rct-method-completion-table '(("uniq") ("uniq!") ))
-(setq alist '(("uniq\t[Array#uniq]") ("uniq!\t[Array#uniq!]") ))
-(setq pattern "uni")
-(try-completion pattern rct-method-completion-table nil)
-)
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/rct-complete/completion_emacs_icicles.taf b/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/rct-complete/completion_emacs_icicles.taf
deleted file mode 100644
index 324a1cfa8..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/rct-complete/completion_emacs_icicles.taf
+++ /dev/null
@@ -1,13 +0,0 @@
-==========
-completion_emacs_icicles
-==========
-rct-complete --completion-emacs-icicles --line=1
-==========
-1.div
-==========
-(progn
-(setq rct-method-completion-table '(("div\t[Fixnum#div]") ("divmod\t[Fixnum#divmod]") ))
-(setq alist '(("div" . "Fixnum#div")("divmod" . "Fixnum#divmod")))
-(setq pattern "div")
-(setq klass "Fixnum")
-)
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/rct-complete/completion_rbtest.taf b/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/rct-complete/completion_rbtest.taf
deleted file mode 100644
index e8c6cbe62..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/rct-complete/completion_rbtest.taf
+++ /dev/null
@@ -1,15 +0,0 @@
-==========
-completion_rbtest
-==========
-rct-complete --rbtest --line=6
-==========
-#!/usr/bin/env ruby
-=begin test_bar
-assert_equal "BAR", bar("bar")
-=end
-def bar(s)
-  s.upca
-end
-==========
-upcase
-upcase!
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/rct-doc/doc.taf b/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/rct-doc/doc.taf
deleted file mode 100644
index aa017f636..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/rct-doc/doc.taf
+++ /dev/null
@@ -1,8 +0,0 @@
-==========
-doc
-==========
-rct-doc -D --line=1
-==========
-[].length
-==========
-Array#length
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/rct-doc/doc_detect_rbtest.taf b/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/rct-doc/doc_detect_rbtest.taf
deleted file mode 100644
index 28ac60836..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/rct-doc/doc_detect_rbtest.taf
+++ /dev/null
@@ -1,8 +0,0 @@
-==========
-doc_detect_rbtest
-==========
-rct-doc --detect-rbtest --line=1
-==========
-[].length
-==========
-Array#length
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/rct-doc/doc_detect_rbtest2.taf b/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/rct-doc/doc_detect_rbtest2.taf
deleted file mode 100644
index 043bea94d..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/rct-doc/doc_detect_rbtest2.taf
+++ /dev/null
@@ -1,14 +0,0 @@
-==========
-doc_detect_rbtest2
-==========
-rct-doc --detect-rbtest --line=6
-==========
-#!/usr/bin/env ruby
-=begin test_bar
-assert_equal "BAR", bar("bar")
-=end
-def bar(s)
-  s.upcase
-end
-==========
-String#upcase
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/rct-doc/doc_rbtest.taf b/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/rct-doc/doc_rbtest.taf
deleted file mode 100644
index 7da58ce76..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/rct-doc/doc_rbtest.taf
+++ /dev/null
@@ -1,14 +0,0 @@
-==========
-doc_rbtest
-==========
-rct-doc --rbtest --line=6
-==========
-#!/usr/bin/env ruby
-=begin test_bar
-assert_equal "BAR", bar("bar")
-=end
-def bar(s)
-  s.upcase
-end
-==========
-String#upcase
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/rct-doc/refe.taf b/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/rct-doc/refe.taf
deleted file mode 100644
index 6f074037d..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/rct-doc/refe.taf
+++ /dev/null
@@ -1,8 +0,0 @@
-==========
-refe
-==========
-rct-doc --refe --line=1
-==========
-[].length
-==========
-refe 'Array#length'
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/rct-doc/ri.taf b/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/rct-doc/ri.taf
deleted file mode 100644
index 02f27d6a1..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/rct-doc/ri.taf
+++ /dev/null
@@ -1,8 +0,0 @@
-==========
-ri
-==========
-rct-doc --ri --line=1
-==========
-[].length
-==========
-ri 'Array#length'
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/rct-doc/ri_emacs.taf b/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/rct-doc/ri_emacs.taf
deleted file mode 100644
index b41c7e373..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/rct-doc/ri_emacs.taf
+++ /dev/null
@@ -1,8 +0,0 @@
-==========
-ri_emacs
-==========
-rct-doc --ri-emacs --line=1
-==========
-[].length
-==========
-(rct-find-tag-or-ri "Array#length")
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/rct-doc/ri_vim.taf b/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/rct-doc/ri_vim.taf
deleted file mode 100644
index 11413ce40..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/rct-doc/ri_vim.taf
+++ /dev/null
@@ -1,8 +0,0 @@
-==========
-ri_vim
-==========
-rct-doc --ri-vim --line=1
-==========
-[].length
-==========
-call RCT_find_tag_or_ri("Array#length")
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/sample_test_script.rb b/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/sample_test_script.rb
deleted file mode 100644
index b368a8ca2..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/sample_test_script.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'test/unit'
-class TestSample < Test::Unit::TestCase
-  def test_sample0
-    assert(true)
-  end
-
-  def test_sample1
-  end
-end
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/xmpfilter/add_markers.taf b/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/xmpfilter/add_markers.taf
deleted file mode 100644
index 88e846131..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/xmpfilter/add_markers.taf
+++ /dev/null
@@ -1,10 +0,0 @@
-==========
-add_markers
-==========
-xmpfilter -m
-==========
-1+1
-2+3
-==========
-1+1                                                # =>
-2+3                                                # =>
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/xmpfilter/bindings.taf b/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/xmpfilter/bindings.taf
deleted file mode 100644
index bcd30560d..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/xmpfilter/bindings.taf
+++ /dev/null
@@ -1,63 +0,0 @@
-==========
-bindings
-==========
-xmpfilter --poetry -u
-==========
-
-require 'test/unit'
-
-class TestFoo < Test::Unit::TestCase
-  def setup
-    @o = []
-  end
-
-  def test_foo
-    a = 1
-    b = a
-    b                                              # =>
-  end
-
-  def test_arr
-    last = 1
-    @o << last
-    @o.last                                        # =>
-  end
-
-  def test_bar
-    a = b = c = 1
-    d = a
-    d                                              # =>
-  end
-end
-==========
-
-require 'test/unit'
-
-class TestFoo < Test::Unit::TestCase
-  def setup
-    @o = []
-  end
-
-  def test_foo
-    a = 1
-    b = a
-    assert_equal a, b
-    assert_equal 1, b
-  end
-
-  def test_arr
-    last = 1
-    @o << last
-    assert_equal last, @o.last
-    assert_equal 1, @o.last
-  end
-
-  def test_bar
-    a = b = c = 1
-    d = a
-    assert_equal a, d
-    assert_equal b, d
-    assert_equal c, d
-    assert_equal 1, d
-  end
-end
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/xmpfilter/comment_out.taf b/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/xmpfilter/comment_out.taf
deleted file mode 100644
index 2520e79d7..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/xmpfilter/comment_out.taf
+++ /dev/null
@@ -1,22 +0,0 @@
-==========
-comment_out
-==========
-xmpfilter 
-==========
-
-# 1   # =>
-# 1   # => 2
-1   # => 12
-1
-# # =>
-# 1
-# # =>
-==========
-
-# 1   # =>
-# 1   # => 2
-1   # => 1
-1
-# # =>
-# 1
-# # =>
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/xmpfilter/exception.taf b/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/xmpfilter/exception.taf
deleted file mode 100644
index 3918c2e4d..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/xmpfilter/exception.taf
+++ /dev/null
@@ -1,14 +0,0 @@
-==========
-exception
-==========
-xmpfilter 
-==========
-def foo
-  raise NameError, "ERR!!" rescue $@ # => 
-end
-foo
-==========
-def foo
-  raise NameError, "ERR!!" rescue $@ # => ["-:2:in `foo'", "-:4"]
-end
-foo
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/xmpfilter/expectations.taf b/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/xmpfilter/expectations.taf
deleted file mode 100644
index ad244d7ea..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/xmpfilter/expectations.taf
+++ /dev/null
@@ -1,54 +0,0 @@
-==========
-expectations
-==========
-xmpfilter --expectations
-==========
-
-require 'rubygems'
-require 'expectations'
-
-S = Struct.new :a
-Expectations do
-  1 + 1  # =>
-  "a".length # =>
-  [][1] # =>
-  1.hoge # =>
-  1.1 + 1.0 # =>
-  S.new(1) # =>
-end
-==========
-
-require 'rubygems'
-require 'expectations'
-
-S = Struct.new :a
-Expectations do
-  expect 2 do
-    1 + 1
-  end
-
-  expect 1 do
-    "a".length
-  end
-
-  expect nil do
-    [][1]
-  end
-
-  expect NoMethodError do
-    1.hoge
-  end
-
-  expect 2.0999..2.1001 do
-    1.1 + 1.0
-  end
-
-  expect S do
-    S.new(1)
-  end
-
-  expect "#<struct S a=1>" do
-    S.new(1).inspect
-  end
-
-end
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/xmpfilter/last_match.taf b/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/xmpfilter/last_match.taf
deleted file mode 100644
index 56a086384..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/xmpfilter/last_match.taf
+++ /dev/null
@@ -1,18 +0,0 @@
-==========
-last_match
-==========
-xmpfilter 
-==========
-
-md = "abc".match(/(.)(.)./)
-1
-# => 
-[$1, $2]                        # => 
-$1                              # => 
-==========
-
-md = "abc".match(/(.)(.)./)
-1
-# => 1
-[$1, $2]                        # => ["a", "b"]
-$1                              # => "a"
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/xmpfilter/mult.rb b/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/xmpfilter/mult.rb
deleted file mode 100644
index fa9025a07..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/xmpfilter/mult.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-a = ["1111111111111111111111111111111111111111111111111111", 123334324234242342,
-  1332333333,6,8 ]
-1                               # => 1
-a
-# => ["1111111111111111111111111111111111111111111111111111",
-#     123334324234242342,
-#     1332333333,
-#     6,
-#     8]
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/xmpfilter/multi_line_annotation_1.taf b/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/xmpfilter/multi_line_annotation_1.taf
deleted file mode 100644
index 63a0a053d..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/xmpfilter/multi_line_annotation_1.taf
+++ /dev/null
@@ -1,22 +0,0 @@
-==========
-multi_line_annotation_1
-==========
-xmpfilter 
-==========
-
-1+2                             # => 
-a = ["1111111111111111111111111111111111111111111111111111", 123334324234242342,
-  1332333333 ]
-1+2                             # => 
-a
-# =>
-==========
-
-1+2                             # => 3
-a = ["1111111111111111111111111111111111111111111111111111", 123334324234242342,
-  1332333333 ]
-1+2                             # => 3
-a
-# => ["1111111111111111111111111111111111111111111111111111",
-#     123334324234242342,
-#     1332333333]
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/xmpfilter/multi_line_annotation_2.taf b/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/xmpfilter/multi_line_annotation_2.taf
deleted file mode 100644
index d5027dbdf..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/xmpfilter/multi_line_annotation_2.taf
+++ /dev/null
@@ -1,24 +0,0 @@
-==========
-multi_line_annotation_2
-==========
-xmpfilter 
-==========
-
-1+2                             # => 32
-a = ["1111111111111111111111111111111111111111111111111111", 123334324234242342,
-  55555555 ]
-1+2                             # => 300
-a
-# => ["1111111111111111111111111111111111111111111111111111",
-#     123334324234242342,
-#     1332333333]
-==========
-
-1+2                             # => 3
-a = ["1111111111111111111111111111111111111111111111111111", 123334324234242342,
-  55555555 ]
-1+2                             # => 3
-a
-# => ["1111111111111111111111111111111111111111111111111111",
-#     123334324234242342,
-#     55555555]
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/xmpfilter/multi_line_annotation_3.taf b/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/xmpfilter/multi_line_annotation_3.taf
deleted file mode 100644
index 2b5efef34..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/xmpfilter/multi_line_annotation_3.taf
+++ /dev/null
@@ -1,20 +0,0 @@
-==========
-multi_line_annotation_3
-==========
-xmpfilter 
-==========
-
-a = ["1111111111111111111111111111111111111111111111111111", 123334324234242342,
-  1332333333 ]
-a
-# =>
-1                               # =>
-==========
-
-a = ["1111111111111111111111111111111111111111111111111111", 123334324234242342,
-  1332333333 ]
-a
-# => ["1111111111111111111111111111111111111111111111111111",
-#     123334324234242342,
-#     1332333333]
-1                               # => 1
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/xmpfilter/multi_line_annotation_4.taf b/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/xmpfilter/multi_line_annotation_4.taf
deleted file mode 100644
index e8adac712..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/xmpfilter/multi_line_annotation_4.taf
+++ /dev/null
@@ -1,22 +0,0 @@
-==========
-multi_line_annotation_4
-==========
-xmpfilter 
-==========
-
-a = ["1111111111111111111111111111111111111111111111111111", 123334324234242342,
-  55555555 ]
-a
-# => ["1111111111111111111111111111111111111111111111111111",
-#     123334324234242342,
-#     1332333333]
-# not removed
-==========
-
-a = ["1111111111111111111111111111111111111111111111111111", 123334324234242342,
-  55555555 ]
-a
-# => ["1111111111111111111111111111111111111111111111111111",
-#     123334324234242342,
-#     55555555]
-# not removed
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/xmpfilter/multi_line_annotation_5.taf b/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/xmpfilter/multi_line_annotation_5.taf
deleted file mode 100644
index af0cb8460..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/xmpfilter/multi_line_annotation_5.taf
+++ /dev/null
@@ -1,34 +0,0 @@
-==========
-multi_line_annotation_5
-==========
-xmpfilter 
-==========
-
-def test
-  a = ["1111111111111111111111111111111111111111111111111111", 123334324234242342,
-    55555555 ]
-  a
-  # => ["",
-  #     123334324234242342,
-  #     1332333333]
-  a
-  # =>
-  # not removed
-end
-test
-==========
-
-def test
-  a = ["1111111111111111111111111111111111111111111111111111", 123334324234242342,
-    55555555 ]
-  a
-  # => ["1111111111111111111111111111111111111111111111111111",
-  #     123334324234242342,
-  #     55555555]
-  a
-  # => ["1111111111111111111111111111111111111111111111111111",
-  #     123334324234242342,
-  #     55555555]
-  # not removed
-end
-test
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/xmpfilter/multi_line_annotation_6.taf b/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/xmpfilter/multi_line_annotation_6.taf
deleted file mode 100644
index 24c48e2b0..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/xmpfilter/multi_line_annotation_6.taf
+++ /dev/null
@@ -1,12 +0,0 @@
-==========
-multi_line_annotation_6
-==========
-xmpfilter 
-==========
-
-1 + 2 # !> warning
-# =>
-==========
-
-1 + 2
-# => 3
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/xmpfilter/multi_line_annotation_7.taf b/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/xmpfilter/multi_line_annotation_7.taf
deleted file mode 100644
index 21ed1daec..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/xmpfilter/multi_line_annotation_7.taf
+++ /dev/null
@@ -1,23 +0,0 @@
-==========
-multi_line_annotation_7
-==========
-xmpfilter 
-==========
-
-[1,2]
-# =>
-raise
-[3,4]
-# =>
-[5,6]
-# =>
-==========
-
-[1,2]
-# => [1, 2]
-raise
-[3,4]
-# => 
-[5,6]
-# => 
-# ~> -:2: unhandled exception
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/xmpfilter/no_warnings.taf b/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/xmpfilter/no_warnings.taf
deleted file mode 100644
index 76cf8b021..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/xmpfilter/no_warnings.taf
+++ /dev/null
@@ -1,13 +0,0 @@
-==========
-no_warnings
-==========
-xmpfilter --no-warnings
-==========
-A = 1
-A = 1
-p (1)
-==========
-A = 1
-A = 1
-p (1)
-# >> 1
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/xmpfilter/nospace.taf b/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/xmpfilter/nospace.taf
deleted file mode 100644
index bb71aeae4..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/xmpfilter/nospace.taf
+++ /dev/null
@@ -1,16 +0,0 @@
-==========
-nospace_annotation
-==========
-xmpfilter 
-==========
-
-1 #=>
-2 #=> 2
-3
-#=>
-==========
-
-1 # => 1
-2 # => 2
-3
-# => 3
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/xmpfilter/rspec.taf b/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/xmpfilter/rspec.taf
deleted file mode 100644
index 6c3a3d666..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/xmpfilter/rspec.taf
+++ /dev/null
@@ -1,106 +0,0 @@
-==========
-rspec
-==========
-xmpfilter -s
-==========
-
-class X
-  Y = Struct.new(:a)
-  def foo(b); b ? Y.new(2) : 2 end
-  def bar; raise "No good" end
-  def baz; nil end
-  def fubar(x); x ** 2.0 + 1 end
-  def babar; [1,2] end
-  A = 1
-  A = 1
-end
-
-
-describe "xmpfilter's expectation expansion" do
-  before do
-    @o = X.new
-  end
-
-  it "should expand should == expectations" do
-    @o.foo(true)   # =>
-    @o.foo(true).a # =>
-    @o.foo(false)  # =>
-  end
-  
-  it "should expand should raise_error expectations" do
-    @o.bar         # =>
-  end
-
-  it "should expand should be_nil expectations" do
-    @o.baz         # =>
-  end
-
-  it "should expand correct expectations for complex values" do
-    @o.babar       # =>
-  end
-
-  it "should expand should be_close expectations" do
-    @o.fubar(10)   # =>
-  end
-end
-
-describe "xmpfilter's automagic binding detection" do
-  it "should expand should == expectations" do
-    a = b = c = 1
-    d = a
-    d                                              # =>
-  end
-end
-==========
-
-class X
-  Y = Struct.new(:a)
-  def foo(b); b ? Y.new(2) : 2 end
-  def bar; raise "No good" end
-  def baz; nil end
-  def fubar(x); x ** 2.0 + 1 end
-  def babar; [1,2] end
-  A = 1
-  A = 1 # !> already initialized constant A
-end
-
-
-describe "xmpfilter's expectation expansion" do
-  before do
-    @o = X.new
-  end
-
-  it "should expand should == expectations" do
-    (@o.foo(true)).should be_a_kind_of(X::Y)
-    (@o.foo(true).inspect).should == ("#<struct X::Y a=2>")
-    (@o.foo(true).a).should == (2)
-    (@o.foo(false)).should == (2)
-  end
-  
-  it "should expand should raise_error expectations" do
-    lambda{@o.bar}.should raise_error(RuntimeError)
-  end
-
-  it "should expand should be_nil expectations" do
-    (@o.baz).should be_nil
-  end
-
-  it "should expand correct expectations for complex values" do
-    (@o.babar).should == ([1, 2])
-  end
-
-  it "should expand should be_close expectations" do
-    (@o.fubar(10)).should be_close(101.0, 0.0001)
-  end
-end
-
-describe "xmpfilter's automagic binding detection" do
-  it "should expand should == expectations" do
-    a = b = c = 1
-    d = a
-    (d).should == (a)
-    (d).should == (b)
-    (d).should == (c)
-    (d).should == (1)
-  end
-end
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/xmpfilter/rspec_poetry.taf b/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/xmpfilter/rspec_poetry.taf
deleted file mode 100644
index 0bcd6859a..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/xmpfilter/rspec_poetry.taf
+++ /dev/null
@@ -1,106 +0,0 @@
-==========
-rspec_poetry
-==========
-xmpfilter -s --poetry
-==========
-
-class X
-  Y = Struct.new(:a)
-  def foo(b); b ? Y.new(2) : 2 end
-  def bar; raise "No good" end
-  def baz; nil end
-  def fubar(x); x ** 2.0 + 1 end
-  def babar; [1,2] end
-  A = 1
-  A = 1
-end
-
-
-describe "xmpfilter's expectation expansion" do
-  before do
-    @o = X.new
-  end
-
-  it "should expand should == expectations" do
-    @o.foo(true)   # =>
-    @o.foo(true).a # =>
-    @o.foo(false)  # =>
-  end
-  
-  it "should expand should raise_error expectations" do
-    @o.bar         # =>
-  end
-
-  it "should expand should be_nil expectations" do
-    @o.baz         # =>
-  end
-
-  it "should expand correct expectations for complex values" do
-    @o.babar       # =>
-  end
-
-  it "should expand should be_close expectations" do
-    @o.fubar(10)   # =>
-  end
-end
-
-describe "xmpfilter's automagic binding detection" do
-  it "should expand should == expectations" do
-    a = b = c = 1
-    d = a
-    d                                              # =>
-  end
-end
-==========
-
-class X
-  Y = Struct.new(:a)
-  def foo(b); b ? Y.new(2) : 2 end
-  def bar; raise "No good" end
-  def baz; nil end
-  def fubar(x); x ** 2.0 + 1 end
-  def babar; [1,2] end
-  A = 1
-  A = 1 # !> already initialized constant A
-end
-
-
-describe "xmpfilter's expectation expansion" do
-  before do
-    @o = X.new
-  end
-
-  it "should expand should == expectations" do
-    @o.foo(true).should be_a_kind_of(X::Y)
-    @o.foo(true).inspect.should == "#<struct X::Y a=2>"
-    @o.foo(true).a.should == 2
-    @o.foo(false).should == 2
-  end
-  
-  it "should expand should raise_error expectations" do
-    lambda{@o.bar}.should raise_error(RuntimeError)
-  end
-
-  it "should expand should be_nil expectations" do
-    @o.baz.should be_nil
-  end
-
-  it "should expand correct expectations for complex values" do
-    @o.babar.should == [1, 2]
-  end
-
-  it "should expand should be_close expectations" do
-    @o.fubar(10).should be_close(101.0, 0.0001)
-  end
-end
-
-describe "xmpfilter's automagic binding detection" do
-  it "should expand should == expectations" do
-    a = b = c = 1
-    d = a
-    d.should == a
-    d.should == b
-    d.should == c
-    d.should == 1
-  end
-end
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/xmpfilter/simple_annotation.taf b/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/xmpfilter/simple_annotation.taf
deleted file mode 100644
index 9aa82d54b..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/xmpfilter/simple_annotation.taf
+++ /dev/null
@@ -1,22 +0,0 @@
-==========
-simple_annotation
-==========
-xmpfilter 
-==========
-
-a = 1
-10.times do |i|
-  i ** 2                                           # =>
-  a += i
-end
-A = 1
-A = 1
-==========
-
-a = 1
-10.times do |i|
-  i ** 2                                           # => 0, 1, 4, 9, 16, 25, 36, 49, 64, 81
-  a += i
-end
-A = 1
-A = 1 # !> already initialized constant A
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/xmpfilter/unit_test.taf b/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/xmpfilter/unit_test.taf
deleted file mode 100644
index 662ae861b..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/xmpfilter/unit_test.taf
+++ /dev/null
@@ -1,108 +0,0 @@
-==========
-unit_test
-==========
-xmpfilter -u
-==========
-
-class X
-  Y = Struct.new(:a)
-  def foo(b); b ? Y.new(2) : 2 end
-  def bar; raise "No good" end
-  def baz; nil end
-  def fubar(x); x ** 2.0 + 1 end
-  def babar; [1,2] end
-  A = 1
-  A = 1
-  def difftype() [1, "s"] end
-end
-
-
-require 'test/unit'
-class Test_X < Test::Unit::TestCase
-  def setup
-    @o = X.new
-  end
-
-  def test_foo
-    @o.foo(true)   # =>
-    @o.foo(true).a # =>
-    @o.foo(false)  # =>
-  end
-  
-  def test_bar
-    @o.bar         # =>
-  end
-
-  def test_baz
-    @o.baz         # =>
-  end
-
-  def test_babar
-    @o.babar       # =>
-  end
-
-  def test_fubar
-    @o.fubar(10)   # =>
-  end
-
-  def test_difftype
-    for x in @o.difftype
-      x            # =>
-    end
-  end
-
-end
-
-==========
-
-class X
-  Y = Struct.new(:a)
-  def foo(b); b ? Y.new(2) : 2 end
-  def bar; raise "No good" end
-  def baz; nil end
-  def fubar(x); x ** 2.0 + 1 end
-  def babar; [1,2] end
-  A = 1
-  A = 1 # !> already initialized constant A
-  def difftype() [1, "s"] end
-end
-
-
-require 'test/unit'
-class Test_X < Test::Unit::TestCase
-  def setup
-    @o = X.new
-  end
-
-  def test_foo
-    assert_kind_of(X::Y, @o.foo(true))
-    assert_equal("#<struct X::Y a=2>", @o.foo(true).inspect)
-    assert_equal(2, @o.foo(true).a)
-    assert_equal(2, @o.foo(false))
-  end
-  
-  def test_bar
-    assert_raise(RuntimeError){@o.bar}
-  end
-
-  def test_baz
-    assert_nil(@o.baz)
-  end
-
-  def test_babar
-    assert_equal([1, 2], @o.babar)
-  end
-
-  def test_fubar
-    assert_in_delta(101.0, @o.fubar(10), 0.0001)
-  end
-
-  def test_difftype
-    for x in @o.difftype
-      #xmpfilter: WARNING!! extra values ignored
-      assert_equal(1, x)
-    end
-  end
-
-end
-
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/xmpfilter/unit_test_detect_rbtest.taf b/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/xmpfilter/unit_test_detect_rbtest.taf
deleted file mode 100644
index 7cc5893e7..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/xmpfilter/unit_test_detect_rbtest.taf
+++ /dev/null
@@ -1,108 +0,0 @@
-==========
-unit_test_detect_rbtest
-==========
-xmpfilter -u --detect-rbtest
-==========
-
-class X
-  Y = Struct.new(:a)
-  def foo(b); b ? Y.new(2) : 2 end
-  def bar; raise "No good" end
-  def baz; nil end
-  def fubar(x); x ** 2.0 + 1 end
-  def babar; [1,2] end
-  A = 1
-  A = 1
-  def difftype() [1, "s"] end
-end
-
-
-require 'test/unit'
-class Test_X < Test::Unit::TestCase
-  def setup
-    @o = X.new
-  end
-
-  def test_foo
-    @o.foo(true)   # =>
-    @o.foo(true).a # =>
-    @o.foo(false)  # =>
-  end
-  
-  def test_bar
-    @o.bar         # =>
-  end
-
-  def test_baz
-    @o.baz         # =>
-  end
-
-  def test_babar
-    @o.babar       # =>
-  end
-
-  def test_fubar
-    @o.fubar(10)   # =>
-  end
-
-  def test_difftype
-    for x in @o.difftype
-      x            # =>
-    end
-  end
-
-end
-
-==========
-
-class X
-  Y = Struct.new(:a)
-  def foo(b); b ? Y.new(2) : 2 end
-  def bar; raise "No good" end
-  def baz; nil end
-  def fubar(x); x ** 2.0 + 1 end
-  def babar; [1,2] end
-  A = 1
-  A = 1 # !> already initialized constant A
-  def difftype() [1, "s"] end
-end
-
-
-require 'test/unit'
-class Test_X < Test::Unit::TestCase
-  def setup
-    @o = X.new
-  end
-
-  def test_foo
-    assert_kind_of(X::Y, @o.foo(true))
-    assert_equal("#<struct X::Y a=2>", @o.foo(true).inspect)
-    assert_equal(2, @o.foo(true).a)
-    assert_equal(2, @o.foo(false))
-  end
-  
-  def test_bar
-    assert_raise(RuntimeError){@o.bar}
-  end
-
-  def test_baz
-    assert_nil(@o.baz)
-  end
-
-  def test_babar
-    assert_equal([1, 2], @o.babar)
-  end
-
-  def test_fubar
-    assert_in_delta(101.0, @o.fubar(10), 0.0001)
-  end
-
-  def test_difftype
-    for x in @o.difftype
-      #xmpfilter: WARNING!! extra values ignored
-      assert_equal(1, x)
-    end
-  end
-
-end
-
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/xmpfilter/unit_test_detect_rbtest2.taf b/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/xmpfilter/unit_test_detect_rbtest2.taf
deleted file mode 100644
index 219b4a996..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/xmpfilter/unit_test_detect_rbtest2.taf
+++ /dev/null
@@ -1,18 +0,0 @@
-==========
-unit_test_detect_rbtest2
-==========
-xmpfilter --detect-rbtest
-==========
-=begin test_bar
-bar("bar")    # =>
-=end
-def bar(s)
-  s.upcase
-end
-==========
-=begin test_bar
-assert_equal("BAR", bar("bar"))
-=end
-def bar(s)
-  s.upcase
-end
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/xmpfilter/unit_test_poetry.taf b/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/xmpfilter/unit_test_poetry.taf
deleted file mode 100644
index b7c24902f..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/xmpfilter/unit_test_poetry.taf
+++ /dev/null
@@ -1,108 +0,0 @@
-==========
-unit_test_poetry
-==========
-xmpfilter -u --poetry
-==========
-
-class X
-  Y = Struct.new(:a)
-  def foo(b); b ? Y.new(2) : 2 end
-  def bar; raise "No good" end
-  def baz; nil end
-  def fubar(x); x ** 2.0 + 1 end
-  def babar; [1,2] end
-  A = 1
-  A = 1
-  def difftype() [1, "s"] end
-end
-
-
-require 'test/unit'
-class Test_X < Test::Unit::TestCase
-  def setup
-    @o = X.new
-  end
-
-  def test_foo
-    @o.foo(true)   # =>
-    @o.foo(true).a # =>
-    @o.foo(false)  # =>
-  end
-  
-  def test_bar
-    @o.bar         # =>
-  end
-
-  def test_baz
-    @o.baz         # =>
-  end
-
-  def test_babar
-    @o.babar       # =>
-  end
-
-  def test_fubar
-    @o.fubar(10)   # =>
-  end
-
-  def test_difftype
-    for x in @o.difftype
-      x            # =>
-    end
-  end
-
-end
-
-==========
-
-class X
-  Y = Struct.new(:a)
-  def foo(b); b ? Y.new(2) : 2 end
-  def bar; raise "No good" end
-  def baz; nil end
-  def fubar(x); x ** 2.0 + 1 end
-  def babar; [1,2] end
-  A = 1
-  A = 1 # !> already initialized constant A
-  def difftype() [1, "s"] end
-end
-
-
-require 'test/unit'
-class Test_X < Test::Unit::TestCase
-  def setup
-    @o = X.new
-  end
-
-  def test_foo
-    assert_kind_of X::Y, @o.foo(true) 
-    assert_equal "#<struct X::Y a=2>", @o.foo(true).inspect
-    assert_equal 2, @o.foo(true).a
-    assert_equal 2, @o.foo(false)
-  end
-  
-  def test_bar
-    assert_raise(RuntimeError){@o.bar}
-  end
-
-  def test_baz
-    assert_nil @o.baz
-  end
-
-  def test_babar
-    assert_equal [1, 2], @o.babar
-  end
-
-  def test_fubar
-    assert_in_delta 101.0, @o.fubar(10), 0.0001
-  end
-
-  def test_difftype
-    for x in @o.difftype
-      #xmpfilter: WARNING!! extra values ignored
-      assert_equal 1, x
-    end
-  end
-
-end
-
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/xmpfilter/unit_test_rbtest.taf b/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/xmpfilter/unit_test_rbtest.taf
deleted file mode 100644
index 622f11828..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/xmpfilter/unit_test_rbtest.taf
+++ /dev/null
@@ -1,18 +0,0 @@
-==========
-unit_test_rbtest
-==========
-xmpfilter -u --rbtest
-==========
-=begin test_bar
-bar("bar")    # =>
-=end
-def bar(s)
-  s.upcase
-end
-==========
-=begin test_bar
-assert_equal("BAR", bar("bar"))
-=end
-def bar(s)
-  s.upcase
-end
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/xmpfilter/width.taf b/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/xmpfilter/width.taf
deleted file mode 100644
index 4fa436e02..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/data/xmpfilter/width.taf
+++ /dev/null
@@ -1,16 +0,0 @@
-==========
-width
-==========
-xmpfilter -w 15
-==========
-
-a = ["abcdefg", 12345, Object]
-a
-# => 
-==========
-
-a = ["abcdefg", 12345, Object]
-a
-# => ["abcdefg",
-#     12345,
-#     Object]
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/test_completion.rb b/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/test_completion.rb
deleted file mode 100644
index fce0fef1c..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/test_completion.rb
+++ /dev/null
@@ -1,674 +0,0 @@
-$: << ".." << "../lib"
-require 'rcodetools/completion'
-require 'test/unit'
-
-class TestXMPCompletionFilter < Test::Unit::TestCase
-  include Rcodetools
-  def doit(code, lineno, column=nil, options={})
-    xmp = XMPCompletionFilter.new options
-    xmp.candidates(code, lineno, column).sort
-  end
-
-  def test_complete_method__simple
-    assert_equal(["length"], doit('"a".lengt', 1))
-    assert_equal(["length"], doit('`echo a`.lengt', 1))
-  end
-
-  def test_complete_method__in_arg
-    assert_equal(["length"], doit('print("a".lengt)', 1, 15))
-    assert_equal(["length"], doit("print('a'.lengt)", 1, 15))
-    assert_equal(["length"], doit("((a, b = 1 + 'a'.lengt))", 1, 22))
-  end
-
-  def test_complete_method__in_method
-    assert_equal(["length"], doit(<<EOC, 2))
-  def hoge
-    "a".lengt
-  end
-  hoge
-EOC
-  end
-
-  def test_complete_method__in_not_passing_method
-    assert_raises(XMPCompletionFilter::NoCandidates) do
-      doit(<<EOC, 2)
-  def hoge
-    "a".lengt
-  end
-EOC
-    end
-  end
-
-  def test_complete_singleton_method
-    assert_equal(["aaaaa", "aaaab"], doit(<<EOC, 6))
-  a = 'a'
-  def a.aaaaa
-  end
-  def a.aaaab
-  end
-  a.aa
-EOC
-  end
-
-  def test_complete_global_variable
-    assert_equal(["$hoge"], doit(<<EOC, 2))
-  $hoge = 100
-  $ho
-EOC
-  end
-
-  def test_complete_global_variable__list
-    gvars = doit(<<EOC, 3)
-  $foo = 3
-  $hoge = 100
-  $
-EOC
-    assert gvars.include?("$foo")
-    assert gvars.include?("$hoge")
-  end
-
-  def test_complete_global_variable__with_class
-    assert_equal(["open"], doit(<<EOC, 2))
-  $hoge = File
-  $hoge.op
-EOC
-  end
-
-
-  def test_complete_instance_variable
-    assert_equal(["@hoge"], doit(<<EOC, 2))
-  @hoge = 100
-  @ho
-EOC
-  end
-
-  def test_complete_class_variable_module
-    assert_equal(["@@hoge"], doit(<<EOC, 3))
-  module X
-    @@hoge = 100
-    @@ho
-  end
-EOC
-  end
-
-  def test_complete_class_variable__in_class
-    assert_equal(["@@hoge"], doit(<<EOC, 3))
-  class X
-    @@hoge = 100
-    @@ho
-  end
-EOC
-  end
-
-  def test_complete_class_variable__toplevel
-    assert_equal(["@@hoge"], doit(<<EOC, 2))
-  @@hoge = 100
-  @@ho
-EOC
-  end
-
-  def test_complete_class_variable__in_method
-    assert_equal(["@@hoge"], doit(<<EOC, 4))
-  class Foo
-    def foo
-      @@hoge = 100
-      @@ho
-    end
-  end
-  Foo.new.foo
-EOC
-  end
-
-  def test_complete_class_variable__list
-    assert_equal(%w[@@foo @@hoge], doit(<<EOC, 3))
-  @@hoge = 100
-  @@foo = 2
-  @@
-EOC
-  end
-
-
-  def test_complete_constant__nested
-    assert_equal(["Stat"], doit('File::Sta',1))
-  end
-
-  def test_complete_class_method
-    assert_equal(["popen"], doit('File::pop',1))
-    assert_equal(["popen"], doit('::File::pop',1))
-
-    assert_equal(["popen"], doit('File.pop',1))
-    assert_equal(["popen"], doit('::File.pop',1))
-
-    assert_equal(["new"], doit('::File::Stat.ne',1))
-    assert_equal(["new"], doit('File::Stat.ne',1))
-
-  end
-
-
-  def test_complete_constant__in_class
-    assert_equal(["Fixclass", "Fixnum"], doit(<<EOC, 3))
-  class Fixclass
-    class Bar
-      Fix
-    end
-  end
-EOC
-  end
-
-
-  def test_complete_toplevel_constant
-    assert_equal(["Fixnum"], doit(<<EOC,3))
-  class Foo
-    class Fixnum
-      ::Fixn
-    end
-  end
-EOC
-
-    assert_equal(["Fixnum"], doit(<<EOC,3))
-  class Foo
-    class Fixnum
-      ::Foo::Fixn
-    end
-  end
-EOC
-
-    assert_equal(["Bar"], doit(<<EOC,5))
-  class Foo
-    class Bar
-    end
-  end
-  ::Foo::B
-EOC
-  end
-
-  def test_bare_word__local_variable
-    assert_equal(["aaaaaxx"], doit(<<EOC,2))
-  aaaaaxx = 1
-  aaaa
-EOC
-  end
-
-  def test_bare_word__method
-    assert_equal(["trace_var"], doit("trace",1))
-  end
-
-  def test_bare_word__constant
-    assert_equal(["Fixnum"], doit("Fixn",1))
-  end
-    
-  def test_bare_word__method_in_class
-    assert_equal(["attr_accessor"], doit(<<EOC,2))
-  class X
-    attr_acc
-  end
-EOC
-  end
-
-  def test_bare_word__public_method
-    assert_equal(["hoge"], doit(<<EOC,4))
-  class X
-    def hoge() end
-    def boke
-      hog
-    end
-    new.boke
-  end
-EOC
-  end
-
-  def test_bare_word__private_method
-    assert_equal(["hoge"], doit(<<EOC,5))
-  class X
-    def hoge() end
-    private :hoge
-    def boke
-      hog
-    end
-    new.boke
-  end
-EOC
-  end
-
-  def test_complete_symbol
-    assert_equal([":vccaex"], doit(<<EOC,2))
-a = :vccaex
-:vcca
-EOC
-    
-  end
-
-  #### tricky testcases
-  def test_two_pass
-    assert_equal(["inspect"], doit(<<EOC,2))
-  [1, "a"].each do |x|
-    x.inspec
-  end
-EOC
-  end
-
-  def test_string
-    assert_equal(["inspect"], doit('"()".inspe',1))
-    assert_equal(["inspect"], doit('`echo ()`.inspe',1))
-  end
-
-  def test_not_last_line
-    assert_equal(["inspect"], doit(<<EOC,1))
-  "".inspe
-  1
-EOC
-  end
-
-  def test_column
-    assert_equal(["length"], doit('print("a".lengt + "b".size)', 1, 15))
-  end
-
-  def test_method_chain__String
-    assert_equal(["length"], doit('"a".upcase.capitalize.leng', 1))
-  end
-
-  def test_method_chain__Fixnum
-    assert_equal(["length"], doit('1.to_s.upcase.leng', 1))
-  end
-
-  def test_multi_line__do
-    assert_equal(["each_with_index"], doit(<<EOC, 1, 16))
-[].each_with_ind do |x|
-end
-EOC
-    assert_equal(["each_with_index"], doit(<<EOC, 1, 16))
-[].each_with_ind()do |x|
-end
-EOC
-    assert_equal(["each_with_index"], doit(<<EOC, 1, 16))
-[].each_with_ind do |x,y| end
-EOC
-    assert_equal(["each_with_index"], doit(<<EOC, 1, 16))
-[1].each_with_index do |x,y| [].each do end end
-EOC
-    assert_equal(["each_with_index"], doit(<<EOC, 1, 16))
-[].each_with_ind ; do-do
-EOC
-  end
-
-  def test_multi_line__braces
-    assert_equal(["each_with_index"], doit(<<EOC, 1, 16))
-[].each_with_ind { |x|
-}
-EOC
-    assert_equal(["each_with_index"], doit(<<EOC, 1, 16))
-[].each_with_ind(){ |x|
-}
-EOC
-    assert_equal(["each_with_index"], doit(<<EOC, 1, 16))
-[].each_with_ind {|x,y| }
-EOC
-    assert_equal(["each_with_index"], doit(<<EOC, 1, 16))
-[1].each_with_in {|x,y| [].each { }}
-EOC
-    assert_equal(["each_with_index"], doit(<<EOC, 1, 20))
-{ [1].each_with_inde {|x,y| [].each { }},1}
-
-EOC
-  end
-
-  def test_multi_line__brackets
-    assert_equal(["each_with_index"], doit(<<EOC, 1, 20))
-[ [1].each_with_inde {|x,y| [].each { }},
-1]
-EOC
-  end
-
-  def test_multi_line__parentheses
-    assert_equal(["each_with_index"], doit(<<EOC, 1, 23))
-foo( [1].each_with_inde {|x,y| [].each { }},
-     1)
-EOC
-=begin FIXME
-     assert_equal(["each_with_index"], doit(<<EOC, 2, 23))
- foo( 1,
-      [1].each_with_inde {|x,y| [].each { }})
-EOC
-=end
-  end
-
-  def test_multi_line__control_structures__if
-    assert_equal(["length"], doit(<<EOC, 1))
-if "a".leng
-end
-EOC
-    assert_equal(["length"], doit(<<EOC, 1, 8))
-"a".leng if true
-EOC
-    assert_equal(["length"], doit(<<EOC, 1, 8))
-"a".leng ; if true
-  1
-end
-EOC
-    assert_equal(["length"], doit(<<EOC, 1, 8))
-"a".leng ;if true
-  1
-end
-EOC
-  end
-
-  def test_multi_line__control_structures__if_in_string
-    assert_equal(["length"], doit(<<EOC, 1))
-"if a".leng
-EOC
-    assert_equal(["length"], doit(<<EOC, 1))
-'if a'.leng
-EOC
-    assert_equal(["length"], doit(<<EOC, 1))
-`if a`.leng
-EOC
-  end
-  
-  def test_multi_line__control_structures__other_keywords
-    assert_equal(["length"], doit(<<EOC, 1))
-unless "a".leng
-end
-EOC
-    assert_equal(["length"], doit(<<EOC, 1))
-while "a".leng
-end
-EOC
-    assert_equal(["length"], doit(<<EOC, 1))
-until "a".leng
-end
-EOC
-    assert_equal(["split"], doit(<<EOC, 1))
-for a in "a".spli
-end
-EOC
-  end
-
-  def test_phrase
-    assert_equal(["uniq", "uniq!"], doit('Array.new(3).uni',1))
-    assert_equal(["uniq", "uniq!"], doit('Array.new(3).to_a.uni',1))
-    assert_equal(["uniq", "uniq!"], doit('Array.new(3).map{|x| x.to_i}.uni',1))
-    assert_equal(["uniq", "uniq!"], doit('[][0,(1+1)].uni',1))
- end
-
-  def test_percent__String
-    assert_equal(["length"], doit('%!foo!.leng',1))
-    assert_equal(["length"], doit('%q!foo!.leng',1))
-    assert_equal(["length"], doit('%Q!foo!.leng',1))
-    assert_equal(["length"], doit('%x!foo!.leng',1))
-
-    assert_equal(["length"], doit('%{foo}.leng',1))
-    assert_equal(["length"], doit('%q{foo}.leng',1))
-    assert_equal(["length"], doit('%q!(!.leng',1))
-    assert_equal(["length"], doit('%Q!(!.leng',1))
-    assert_equal(["length"], doit('%x!(!.leng',1))
-    assert_equal(["length"], doit('%x{(}.leng',1))
-
-    assert_equal(["length"], doit('%{f(o)o}.leng',1))
-    assert_equal(["length"], doit('%{f{o}o}.leng',1))
-    assert_equal(["length"], doit('(%{f{o}o}+%!}x!).leng',1))
-  end
-
-  def test_percent__Array
-    assert_equal(["length"], doit('%w!foo!.leng',1))
-    assert_equal(["length"], doit('%W!foo!.leng',1))
-
-    assert_equal(["length"], doit('%w{foo}.leng',1))
-    assert_equal(["length"], doit('%W{foo}.leng',1))
-    assert_equal(["length"], doit('%w!(!.leng',1))
-    assert_equal(["length"], doit('%W!(!.leng',1))
-    assert_equal(["length"], doit('%w{(}.leng',1))
-
-    assert_equal(["length"], doit('%w{f(o)o}.leng',1))
-    assert_equal(["length"], doit('%w{f{o}o}.leng',1))
-    assert_equal(["length"], doit('(%W{f{o}o}+%w!}x!).leng',1))
-  end
-
-  def test_percent__Regexp
-    assert_equal(["kcode"], doit('%r!foo!.kcod',1))
-    assert_equal(["kcode"], doit('%r{foo}.kcod',1))
-    assert_equal(["kcode"], doit('%r!(!.kcod',1))
-    assert_equal(["kcode"], doit('%r{(}.kcod',1))
-    assert_equal(["kcode"], doit('%r{f(o)o}.kcod',1))
-  end
-
-  def test_percent__Symbol
-    assert_equal(["id2name"], doit('%s!foo!.id2nam',1))
-    assert_equal(["id2name"], doit('%s{foo}.id2nam',1))
-    assert_equal(["id2name"], doit('%s!(!.id2nam',1))
-    assert_equal(["id2name"], doit('%s{(}.id2nam',1))
-    assert_equal(["id2name"], doit('%s{f(o)o}.id2nam',1))
-  end
-
-  def test_complete_method__with_NoMethodError
-    assert_equal(["module_function"], doit(<<EOC, 3, nil, :ignore_NoMethodError=>true))
-  module X
-    xx                          # normally NoMethodError
-    module_funct
-  end
-EOC
-  end
-
-  # drawback of ignore_NoMethodError
-  def test_with_or_without_ignore_NoMethodError
-    code = <<EOC
-a=[1]
-x = a[1][0] rescue "aaa"
-x.lengt
-EOC
-    assert_equal(["length"], doit(code, 3))
-    assert_raises(XMPCompletionFilter::NoCandidates) do
-      doit(code, 3, nil, :ignore_NoMethodError=>true)
-    end
-  end
-
-  def test__syntax_error
-    assert_raise(ProcessParticularLine::NewCodeError) do
-      doit(<<EOC, 5)
-end
-module X
-  def x
-  end
-  module_function
-end
-EOC
-    end
-  end
-
-  def test__runtime_error
-    assert_raise(ProcessParticularLine::NewCodeError) do
-      doit(<<EOC, 5)
-__undefined_method__
-module X
-  def x
-  end
-  module_function
-end
-EOC
-    end
-  end
-
-
-  # This is a caveat!! You should use dabbrev for this case.
-  def XXtest_oneline
-    assert_equal(["aaa"], doit('aaa=1; aa', 1))
-  end
-
-################################################################  
-
-  def get_class(code, lineno, column=nil, options={})
-    xmp = XMPCompletionFilter.new options
-    klass, = xmp.runtime_data_with_class(code, lineno, column).sort
-    klass
-  end
-
-  def test_class__Class
-    assert_equal("File", get_class("File::n", 1))
-    assert_equal("File", get_class("File.n", 1))
-    assert_equal("File::Stat", get_class("File::Stat::n", 1))
-    assert_equal("File::Stat", get_class("File::Stat.n", 1))
-
-    assert_equal("FileTest", get_class("FileTest.exis", 1))
-    assert_equal("FileTest", get_class("FileTest::exis", 1))
-  end
-
-  def test_class__NotClass
-    assert_equal("Fixnum", get_class("1.ch", 1))
-    assert_equal("String", get_class("'a'.siz", 1))
-  end
-end
-
-
-class TestXMPCompletionVerboseFilter < Test::Unit::TestCase
-  include Rcodetools
-  def doit(code, lineno, column=nil, options={})
-    xmp = XMPCompletionVerboseFilter.new options
-    xmp.candidates(code, lineno, column).sort
-  end
-
-  def test_complete_global_variable
-    assert_equal(["$hoge"], doit(<<EOC, 2))
-  $hoge = 100
-  $ho
-EOC
-  end
-
-  def test_complete_instance_variable
-    assert_equal(["@hoge"], doit(<<EOC, 2))
-  @hoge = 100
-  @ho
-EOC
-  end
-
-  def test_complete_list_instance_variable
-    assert_equal(%w[@bar @baz @foo @hoge], doit(<<EOC, 5))
-  @foo = 1
-  @bar = 2
-  @baz = 3
-  @hoge = 100
-  @
-EOC
-  end
-
-  def test_complete_class_variable_module
-    assert_equal(["@@hoge"], doit(<<EOC, 3))
-  module X
-    @@hoge = 100
-    @@ho
-  end
-EOC
-  end
-
-  def test_complete_constant__nested
-    assert_equal(["Stat"], doit('File::Sta',1))
-  end
-
-  def test_complete_class_method
-    assert_equal(["popen\0IO.popen"], doit('File::pop',1))
-    assert_equal(["popen\0IO.popen"], doit('::File::pop',1))
-
-    assert_equal(["popen\0IO.popen"], doit('File.pop',1))
-    assert_equal(["popen\0IO.popen"], doit('::File.pop',1))
-
-    assert_equal(["new\0File::Stat.new"], doit('::File::Stat.ne', 1))
-    assert_equal(["new\0File::Stat.new"], doit('File::Stat.ne',1))
-
-  end
-
-  def test_complete_constant__in_class
-    assert_equal(["Fixclass", "Fixnum"], doit(<<EOC, 3))
-  class Fixclass
-    class Bar
-      Fix
-    end
-  end
-EOC
-  end
-
-
-  def test_complete_toplevel_constant
-    assert_equal(["Fixnum"], doit(<<EOC,3))
-  class Foo
-    class Fixnum
-      ::Fixn
-    end
-  end
-EOC
-
-    assert_equal(["Fixnum"], doit(<<EOC,3))
-  class Foo
-    class Fixnum
-      ::Foo::Fixn
-    end
-  end
-EOC
-
-    assert_equal(["Bar"], doit(<<EOC,5))
-  class Foo
-    class Bar
-    end
-  end
-  ::Foo::B
-EOC
-  end
-
-  def test_complete_symbol
-    assert_equal([":vccaex"], doit(<<EOC,2))
-a = :vccaex
-:vcca
-EOC
-    
-  end
-
-  def test_method_chain__String
-    assert_equal(["length\0String#length"], doit('"a".upcase.capitalize.leng', 1))
-  end
-
-  def test_bare_word__local_variable
-    assert_equal(["aaaaaxx"], doit(<<EOC,2))
-  aaaaaxx = 1
-  aaaa
-EOC
-  end
-
-  def test_bare_word__method
-    assert_equal(["trace_var\0Kernel#trace_var"], doit("trace",1))
-  end
-
-  def test_bare_word__constant
-    assert_equal(["Fixnum"], doit("Fixn",1))
-  end
-    
-  def test_bare_word__method_in_class
-    assert_equal(["attr_accessor\0Module#attr_accessor"], doit(<<EOC,2))
-  class X
-    attr_acc
-  end
-EOC
-  end
-
-  def test_bare_word__public_method
-    assert_equal(["hoge\0X#hoge"], doit(<<EOC,4))
-  class X
-    def hoge() end
-    def boke
-      hog
-    end
-    new.boke
-  end
-EOC
-  end
-
-  def test_bare_word__private_method
-    assert_equal(["hoge\0X#hoge"], doit(<<EOC,5))
-  class X
-    def hoge() end
-    private :hoge
-    def boke
-      hog
-    end
-    new.boke
-  end
-EOC
-  end
-
-end
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/test_doc.rb b/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/test_doc.rb
deleted file mode 100644
index a1a555c1d..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/test_doc.rb
+++ /dev/null
@@ -1,446 +0,0 @@
-$: << ".." << "../lib"
-require 'rcodetools/doc'
-require 'test/unit'
-
-class TestXMPDocFilter < Test::Unit::TestCase
-  include Rcodetools
-  def doit(code, lineno, column=nil, options={})
-    xmp = XMPDocFilter.new options
-    xmp.doc(code, lineno, column)
-  end
-
-  def test_instance_method__Array
-    assert_equal("Array#length", doit("[].length", 1))
-  end
-
-  def test_instance_method__Fixnum
-    assert_equal("Fixnum#to_s", doit("1.to_s", 1))
-  end
-
-  def test_instance_method__Enumerable
-    assert_equal("Enumerable#each_with_index", doit("[].each_with_index", 1))
-  end
-
-  def test_instance_method__String
-    assert_equal("String#length", doit("'a'.length", 1))
-  end
-
-  def test_class_method__IO_popen
-    assert_equal("IO.popen", doit("IO::popen", 1))
-    assert_equal("IO.popen", doit("IO.popen", 1))
-  end
-
-  def test_class_method__File_popen
-    assert_equal("IO.popen", doit("File::popen", 1))
-    assert_equal("IO.popen", doit("File.popen", 1))
-
-    assert_equal("IO.popen", doit(<<EOC,2))
-$hoge = File
-$hoge.popen
-EOC
-  end
-
-  # not File::Stat.methods(false).include? 'new'
-  def test_class_method__File_Stat_new
-    assert_equal("File::Stat.new", doit("File::Stat.new", 1))
-    assert_equal("File::Stat.new", doit("File::Stat::new", 1))
-
-    assert_equal("File::Stat.new", doit("::File::Stat.new", 1))
-    assert_equal("File::Stat.new", doit("::File::Stat::new", 1))
-  end
-
-  # IO.methods(false).include? 'new'
-  def test_class_method__IO_new
-    assert_equal("IO.new", doit("IO.new", 1))
-    assert_equal("IO.new", doit("IO::new", 1))
-
-    assert_equal("IO.new", doit("::IO.new", 1))
-    assert_equal("IO.new", doit("::IO::new", 1))
-  end
-
-
-  def test_constant__File
-    assert_equal("File", doit("File", 1))
-    assert_equal("File", doit("::File", 1))
-  end
-
-  def test_constant__File_Stat
-    assert_equal("File::Stat", doit("File::Stat", 1))
-    assert_equal("File::Stat", doit("::File::Stat", 1))
-  end
-
-  def test_instance_method__File_Stat
-    assert_equal("File::Stat#atime", doit(<<EOC,2))
-stat = File::Stat.new "#{__FILE__}"
-stat.atime
-EOC
-    assert_equal("File::Stat#atime", doit(<<EOC,2))
-stat = ::File::Stat.new "#{__FILE__}"
-stat.atime
-EOC
-  end
-
-  def test_instance_method__Hoge_File_Stat_1
-    assert_equal("Hoge::File::Stat#atime", doit(<<EOC,11))
-module Hoge
-  module File
-    class Stat
-      def initialize(file)
-      end
-      def atime
-      end
-    end
-  end
-  stat = File::Stat.new "#{__FILE__}"
-  stat.atime
-end
-EOC
-  end
-
-  def test_instance_method__Hoge_File_Stat_2
-    assert_equal("File::Stat#atime", doit(<<EOC,11))
-module Hoge
-  module File
-    class Stat
-      def initialize(file)
-      end
-      def atime
-      end
-    end
-  end
-  stat = ::File::Stat.new "#{__FILE__}"
-  stat.atime
-end
-EOC
-  end
-
-  def test_bare_word__Kernel
-    assert_equal("Kernel#print", doit("print", 1))
-  end
-
-  def test_bare_word__Module
-    assert_equal("Kernel#print", doit(<<EOC, 2))
-module Foo
-  print
-end
-EOC
-  end
-
-  def test_bare_word__class
-    assert_equal("Kernel#print", doit(<<EOC, 2))
-class Foo
-  print
-end
-EOC
-  end
-
-
-  def test_bare_word__Module_attr
-    assert_equal("Module#attr", doit(<<EOC, 2))
-module Foo
-  attr
-end
-EOC
-  end
-
-  def test_bare_word__Class_superclass
-    assert_equal("Class#superclass", doit(<<EOC, 2))
-class Foo
-  superclass
-end
-EOC
-  end
-
-  def test_bare_word__Class_object_id
-    assert_equal("Object#object_id", doit(<<EOC, 2))
-class Foo
-  object_id
-end
-EOC
-  end
-
-
-  def test_bare_word__self
-    assert_equal("Foo#foo", doit(<<EOC, 3))
-class Foo
-  def initialize
-    foo
-  end
-  attr :foo
-  new
-end
-EOC
-  end
-
-  def test_column
-    assert_equal("Array#length", doit("[].length + 10", 1, 9))
-    assert_equal("Array#length", doit("[].length + 10", 1, 5))
-  end
-
-  def test_method_chain__String
-    assert_equal("String#length", doit('"a".upcase.capitalize.length', 1))
-    assert_equal("String#capitalize", doit('"a".upcase.capitalize.length', 1, 21))
-  end
-
-  def test_method_chain__Fixnum
-    assert_equal("String#length", doit('1.to_s.upcase.length', 1))
-    assert_equal("String#upcase", doit('1.to_s.upcase.length', 1, 13))
-  end
-
-  def test_multi_line__do
-    assert_equal("Enumerable#each_with_index", doit(<<EOC, 1, 16))
-[].each_with_index do |x|
-end
-EOC
-    assert_equal("Enumerable#each_with_index", doit(<<EOC, 1, 16))
-[].each_with_index()do |x|
-end
-EOC
-    assert_equal("Enumerable#each_with_index", doit(<<EOC, 1, 16))
-[].each_with_index do |x,y| end
-EOC
-    assert_equal("Enumerable#each_with_index", doit(<<EOC, 1, 16))
-[1].each_with_index do |x,y| [].each do end end
-EOC
-    assert_equal("Enumerable#each_with_index", doit(<<EOC, 1, 16))
-[].each_with_index ; do-do
-EOC
-  end
-
-  def test_multi_line__braces
-    assert_equal("Enumerable#each_with_index", doit(<<EOC, 1, 16))
-[].each_with_index { |x|
-}
-EOC
-    assert_equal("Enumerable#each_with_index", doit(<<EOC, 1, 16))
-[].each_with_index(){ |x|
-}
-EOC
-    assert_equal("Enumerable#each_with_index", doit(<<EOC, 1, 16))
-[].each_with_index {|x,y| }
-EOC
-    assert_equal("Enumerable#each_with_index", doit(<<EOC, 1, 16))
-[1].each_with_index {|x,y| [].each { }}
-EOC
-    assert_equal("Enumerable#each_with_index", doit(<<EOC, 1, 20))
-{ [1].each_with_index {|x,y| [].each { }},1}
-
-EOC
-  end
-
-  def test_multi_line__brackets
-    assert_equal("Enumerable#each_with_index", doit(<<EOC, 1, 20))
-[ [1].each_with_index {|x,y| [].each { }},
-1]
-EOC
-  end
-
-  def test_multi_line__parentheses
-    assert_equal("Enumerable#each_with_index", doit(<<EOC, 1, 23))
-foo( [1].each_with_index {|x,y| [].each { }},
-     1)
-EOC
-=begin FIXME
-     assert_equal("Enumerable#each_with_index", doit(<<EOC, 2, 23))
- foo( 1,
-      [1].each_with_index {|x,y| [].each { }})
-EOC
-=end
-  end
-
-  def test_multi_line__control_structures__if
-    assert_equal("String#length", doit(<<EOC, 1))
-if "a".length
-end
-EOC
-    assert_equal("String#length", doit(<<EOC, 1, 8))
-"a".length if true
-EOC
-    assert_equal("String#length", doit(<<EOC, 1, 8))
-"a".length ; if true
-  1
-end
-EOC
-    assert_equal("String#length", doit(<<EOC, 1, 8))
-"a".length ;if true
-  1
-end
-EOC
-  end
-
-  def test_multi_line__control_structures__if_in_string
-    assert_equal("String#length", doit(<<EOC, 1))
-"if a".length
-EOC
-    assert_equal("String#length", doit(<<EOC, 1))
-'if a'.length
-EOC
-    assert_equal("String#length", doit(<<EOC, 1))
-`if a`.length
-EOC
-  end
-  
-  def test_multi_line__control_structures__other_keywords
-    assert_equal("String#length", doit(<<EOC, 1))
-unless "a".length
-end
-EOC
-    assert_equal("String#length", doit(<<EOC, 1))
-while "a".length
-end
-EOC
-    assert_equal("String#length", doit(<<EOC, 1))
-until "a".length
-end
-EOC
-    assert_equal("String#split", doit(<<EOC, 1))
-for a in "a".split
-end
-EOC
-  end
-
-  def test_operator
-    #  +@ -@ is not supported
-    %w[ |  ^  &  <=>  ==  ===  =~  >   >=  <   <=   <<  >>
-        +  -  *  /    %   **   ~
-    ].each do |op|
-      ancestors_re = Fixnum.ancestors.map{|x|x.to_s}.join('|')
-      assert_match(/^#{ancestors_re}##{Regexp.quote(op)}$/, doit("1 #{op} 2",1,2))
-    end
-  end
-
-  def test_aref_aset__Array
-    assert_equal("Array#[]", doit("[0][ 0 ]",1,4))
-    assert_equal("Array#[]=", doit("[0][ 0 ]=10",1,4))
-    assert_equal("Array#[]", doit("[0][0]",1,4))
-    assert_equal("Array#[]=", doit("[0][0]=10",1,4))
-  end
-
-  def test_aref_aset__Object
-    assert_equal("Array#[]", doit("Array.new(3)[ 0 ]",1,13))
-    assert_equal("Array#[]=", doit("Array.new(3)[ 0 ]=10",1,13))
-    assert_equal("Array#[]", doit("Array.new(3)[0]",1,13))
-    assert_equal("Array#[]=", doit("Array.new(3)[0]=10",1,13))
-  end
-
-  def test_aref_aset__Fixnum
-    assert_equal("Fixnum#[]", doit("0[ 0 ]",1,2))
-    assert_equal("Fixnum#[]", doit("0[0]",1,2))
-  end
-
-  def test_aref_aset__String
-    assert_equal("String#[]", doit("'a' + '[0]'[ 0 ]",1,12))
-    assert_equal("String#[]", doit("'[0]'[ 0 ]",1,6))
-    assert_equal("String#[]=", doit("'0'[ 0 ]=10",1,4))
-    assert_equal("String#[]", doit("'[0]'[0]",1,6))
-    assert_equal("String#[]=", doit("'0'[0]=10",1,4))
-  end
-
-  def test_phrase
-    assert_equal("Array#uniq", doit('Array.new(3).uniq',1))
-    assert_equal("Array#uniq", doit('Array.new(3).to_a.uniq',1))
-    assert_equal("Array#uniq", doit('Array.new(3).map{|x| x.to_i}.uniq',1))
-    assert_equal("Array#uniq", doit('[][0,(1+1)].uniq',1))
- end
-
-  def test_percent__String
-    assert_equal("String#length", doit('%!foo!.length',1))
-    assert_equal("String#length", doit('%q!foo!.length',1))
-    assert_equal("String#length", doit('%Q!foo!.length',1))
-    assert_equal("String#length", doit('%x!foo!.length',1))
-
-    assert_equal("String#length", doit('%{foo}.length',1))
-    assert_equal("String#length", doit('%q{foo}.length',1))
-    assert_equal("String#length", doit('%q!(!.length',1))
-    assert_equal("String#length", doit('%Q!(!.length',1))
-    assert_equal("String#length", doit('%x!(!.length',1))
-    assert_equal("String#length", doit('%x{(}.length',1))
-
-    assert_equal("String#length", doit('%{f(o)o}.length',1))
-    assert_equal("String#length", doit('%{f{o}o}.length',1))
-    assert_equal("String#length", doit('(%{f{o}o}+%!}x!).length',1))
-  end
-
-  def test_percent__Array
-    assert_equal("Array#length", doit('%w!foo!.length',1))
-    assert_equal("Array#length", doit('%W!foo!.length',1))
-
-    assert_equal("Array#length", doit('%w{foo}.length',1))
-    assert_equal("Array#length", doit('%W{foo}.length',1))
-    assert_equal("Array#length", doit('%w!(!.length',1))
-    assert_equal("Array#length", doit('%W!(!.length',1))
-    assert_equal("Array#length", doit('%w{(}.length',1))
-
-    assert_equal("Array#length", doit('%w{f(o)o}.length',1))
-    assert_equal("Array#length", doit('%w{f{o}o}.length',1))
-    assert_equal("Array#length", doit('(%W{f{o}o}+%w!}x!).length',1))
-  end
-
-  def test_percent__Regexp
-    assert_equal("Regexp#kcode", doit('%r!foo!.kcode',1))
-    assert_equal("Regexp#kcode", doit('%r{foo}.kcode',1))
-    assert_equal("Regexp#kcode", doit('%r!(!.kcode',1))
-    assert_equal("Regexp#kcode", doit('%r[(].kcode',1))
-    assert_equal("Regexp#kcode", doit('%r<f(o)o>.kcode',1))
-  end
-
-  def test_percent__Symbol
-    assert_equal("Symbol#id2name", doit('%s!foo!.id2name',1))
-    assert_equal("Symbol#id2name", doit('%s{foo}.id2name',1))
-    assert_equal("Symbol#id2name", doit('%s!(!.id2name',1))
-    assert_equal("Symbol#id2name", doit('%s{(}.id2name',1))
-    assert_equal("Symbol#id2name", doit('%s(f(o)o).id2name',1))
-  end
-
-  def test_bare_word__with_NoMethodError
-    assert_equal("Module#module_function", doit(<<EOC, 3, nil, :ignore_NoMethodError=>true))
-  module X
-    xx                          # normally NoMethodError
-    module_function
-  end
-EOC
-  end
-
-  def test__syntax_error
-    assert_raise(ProcessParticularLine::NewCodeError) do
-      doit(<<EOC, 5, nil)
-end
-module X
-  def x
-  end
-  module_function
-end
-EOC
-    end
-  end
-
-  def test__runtime_error
-    assert_raise(ProcessParticularLine::NewCodeError) do
-      doit(<<EOC, 5, nil)
-__undefined_method__
-module X
-  def x
-  end
-  module_function
-end
-EOC
-    end
-  end
-end
-
-class TestXMPRiFilter < Test::Unit::TestCase
-  include Rcodetools
-  def doit(code, lineno, column=nil, options={})
-    xmp = XMPRiFilter.new options
-    xmp.doc(code, lineno, column)
-  end
-
-  def test_class_method__IO_popen
-    assert_equal("ri 'IO::popen'", doit("IO::popen", 1))
-    assert_equal("ri 'IO::popen'", doit("IO.popen", 1))
-  end
-
-  def test_instance_method__Array
-    assert_equal("ri 'Array#length'", doit("[].length", 1))
-  end
-end
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/test_functional.rb b/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/test_functional.rb
deleted file mode 100644
index c1dfb5263..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/test_functional.rb
+++ /dev/null
@@ -1,47 +0,0 @@
-require 'test/unit'
-require 'tempfile'
-class TestFunctional < Test::Unit::TestCase
-  def self.parse_taf(filename)
-    open(filename) do |io|
-      delimiter=Regexp.union(io.gets)
-      io.read.split(delimiter)
-    end
-  end
-
-  def tempfile_with_contents(contents)
-    input = Tempfile.new("rct-test")
-    input.write(contents)
-    input.close
-    input.path
-  end
-
-  DIR = File.expand_path(File.dirname(__FILE__))
-  LIBDIR = File.expand_path(DIR + '/../lib')
-  BINDIR = File.expand_path(DIR + '/../bin')
-
-  # rct-complete-TDC 
-  %w[xmpfilter rct-complete rct-doc].each do |subdir|
-    Dir["#{DIR}/data/#{subdir}/*.taf"].each do |taf|
-      desc, cmdline, input, output = parse_taf(taf)
-      [desc, cmdline].each{|x| x.chomp! }
-      define_method("test_#{desc}") do
-        inputfile = tempfile_with_contents(input)
-        actual_output = `ruby -I#{LIBDIR} #{BINDIR}/#{cmdline} #{inputfile}`
-        assert_equal output, actual_output
-      end
-    end
-  end
-  
-  # TODO
-  Dir["#{DIR}/data/rct-complete-TDC/*.taf"].each do |taf|
-    desc, cmdline, input, output, test = parse_taf(taf)
-    [desc, cmdline].each{|x| x.chomp! }
-    define_method("test_#{desc}") do
-      inputfile = tempfile_with_contents(input)
-      testfile = tempfile_with_contents(test)
-      actual_output = `ruby -I#{LIBDIR} #{BINDIR}/#{cmdline % [inputfile, testfile]} #{inputfile}`
-      assert_equal output, actual_output
-    end
-  end
-
-end
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/test_method_analyzer.rb b/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/test_method_analyzer.rb
deleted file mode 100644
index 7ad36c248..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/test_method_analyzer.rb
+++ /dev/null
@@ -1,107 +0,0 @@
-require 'test/unit'
-
-module ScriptConfig
-  DIR      = File.join(File.expand_path(File.dirname(__FILE__)))
-  SCRIPT   = File.join(DIR, "..", "lib", "method_analyzer.rb")
-  DATAFILE = File.join(DIR, "data", "method_analyzer-data.rb")
-end
-
-class MethodAnalyzerTextOutput < Test::Unit::TestCase
-  include ScriptConfig
-
-  # test (find-sh "ruby -r../method_analyzer data/method_analyzer-data.rb")
-
-  # attr_accessor is actually Module#attr_accessor.
-  # But `f?ri Module.attr_accessor' answers correctly.
-  expected = <<XXX
-method fullnames
-/m/home/rubikitch/src/xmpfilter/test/data/method_analyzer-data.rb:8:Fixnum#+
-/m/home/rubikitch/src/xmpfilter/test/data/method_analyzer-data.rb:17:String#length
-/m/home/rubikitch/src/xmpfilter/test/data/method_analyzer-data.rb:20:Time.now Time#initialize
-/m/home/rubikitch/src/xmpfilter/test/data/method_analyzer-data.rb:21:Time#year Time#month Time#day Array#<<
-/m/home/rubikitch/src/xmpfilter/test/data/method_analyzer-data.rb:22:Class.new Object#initialize
-/m/home/rubikitch/src/xmpfilter/test/data/method_analyzer-data.rb:23:A#a
-/m/home/rubikitch/src/xmpfilter/test/data/method_analyzer-data.rb:24:Class.new B#initialize
-/m/home/rubikitch/src/xmpfilter/test/data/method_analyzer-data.rb:25:A#a
-/m/home/rubikitch/src/xmpfilter/test/data/method_analyzer-data.rb:26:B#b
-/m/home/rubikitch/src/xmpfilter/test/data/method_analyzer-data.rb:27:A#a B#b
-/m/home/rubikitch/src/xmpfilter/test/data/method_analyzer-data.rb:28:A#a B#b Fixnum#+
-/m/home/rubikitch/src/xmpfilter/test/data/method_analyzer-data.rb:29:A.foo
-/m/home/rubikitch/src/xmpfilter/test/data/method_analyzer-data.rb:30:A.foo
-/m/home/rubikitch/src/xmpfilter/test/data/method_analyzer-data.rb:31:B#bb=
-/m/home/rubikitch/src/xmpfilter/test/data/method_analyzer-data.rb:32:B#bb
-
-method definitions
-/m/home/rubikitch/src/xmpfilter/test/data/method_analyzer-data.rb:3:A.foo
-/m/home/rubikitch/src/xmpfilter/test/data/method_analyzer-data.rb:7:A#a
-/m/home/rubikitch/src/xmpfilter/test/data/method_analyzer-data.rb:12:B#initialize
-/m/home/rubikitch/src/xmpfilter/test/data/method_analyzer-data.rb:16:B#b
-XXX
-
-  def self.strip_dir(output)
-    output.gsub(/^.+(method_analyzer-data)/, '\1')
-  end
-
-  def self.split_output(output)
-    strip_dir(output).split(/\n\n/,2)
-  end
-
-  @@fullnames_expected, @@definitions_expected = split_output expected
-
-  actual = strip_dir `ruby -r#{SCRIPT}  '#{DATAFILE}'`
-  @@fullnames_actual, @@definitions_actual = split_output actual
-
-
-  def test_plain_fullnames
-    assert_equal @@fullnames_expected, @@fullnames_actual
-  end
-  
-  def test_plain_definitions
-    assert_equal @@definitions_expected, @@definitions_actual
-  end
-  
-end
-
-class MethodAnalyzerMarshalOutput < Test::Unit::TestCase
-  include ScriptConfig
-
-  METHOD_ANALYSIS = File.join(DIR, "method_analysis")
-  at_exit { File.unlink METHOD_ANALYSIS rescue nil}
-
-  def write_temp_file(str, file)
-    file.replace File.expand_path(file)
-    at_exit { File.unlink file }
-    open(file, "w"){ |f| f.write(str) }
-  end
-
-  def test_marshal_merged
-    begin
-      ENV['METHOD_ANALYZER_FORMAT'] = 'marshal'
-      @pwd = Dir.pwd
-      Dir.chdir DIR
-      a = write_temp_file "z=1+2", "mergeA.rb"
-      system "ruby -r#{SCRIPT} mergeA.rb"
-      method_analysis = Marshal.load(File.read(METHOD_ANALYSIS))
-      assert_equal ["Fixnum#+"],     method_analysis[File.join(DIR, "mergeA.rb")][1]
-    ensure
-      ENV.delete 'METHOD_ANALYZER_FORMAT'
-      Dir.chdir @pwd
-    end
-  end
-
-  def test_marshal_merged
-    begin
-      ENV['METHOD_ANALYZER_FORMAT'] = 'marshal'
-      @pwd = Dir.pwd
-      Dir.chdir DIR
-      
-      b = write_temp_file "[].empty?", "mergeB.rb"
-      system "ruby -r#{SCRIPT} mergeB.rb"
-      method_analysis = Marshal.load(File.read(METHOD_ANALYSIS))
-      assert_equal ["Array#empty?"], method_analysis[File.join(DIR, "mergeB.rb")][1]
-    ensure
-      ENV.delete 'METHOD_ANALYZER_FORMAT'
-      Dir.chdir @pwd
-    end
-  end
-end
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/test_method_args.rb b/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/test_method_args.rb
deleted file mode 100644
index 80fa19c72..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/test_method_args.rb
+++ /dev/null
@@ -1,134 +0,0 @@
-require 'test/unit'
-module MethodArgsScriptConfig
-  DIR      = File.join(File.dirname(__FILE__))
-  SCRIPT   = File.join(DIR, "..", "bin", "rct-meth-args")
-  DATAFILE = File.join(DIR, "data/method_args.data.rb")
-end
-
-class TestMethodArgs < Test::Unit::TestCase
-  # (find-sh "cd ..; method_args.rb -n test/method_args.data.rb")
-  include MethodArgsScriptConfig
-  @@result = `ruby '#{SCRIPT}' -n '#{DATAFILE}'`.split(/\n/)
-  @@result.delete_if{ |line| line =~ /Digest/ and line !~ /method_in_Digest_Base/ }
-  @@result.delete "zzzz OK"
-
-  @@expected = <<XXX.split(/\n/)
-method_args.data.rb:3:FixedArgsMethods.singleton (a1)
-method_args.data.rb:4:FixedArgsMethods#initialize (arg)
-method_args.data.rb:5:FixedArgsMethods#f (a1)
-method_args.data.rb:6:FixedArgsMethods#b (a1, &block)
-method_args.data.rb:7:FixedArgsMethods#defmethod (...)
-method_args.data.rb:8:FixedArgsMethods#by_attr_accessor
-method_args.data.rb:8:FixedArgsMethods#by_attr_accessor= (value)
-method_args.data.rb:9:FixedArgsMethods#by_attr_false
-method_args.data.rb:10:FixedArgsMethods#by_attr_true
-method_args.data.rb:10:FixedArgsMethods#by_attr_true= (value)
-method_args.data.rb:11:FixedArgsMethods#by_attr_reader_1
-method_args.data.rb:11:FixedArgsMethods#by_attr_reader_2
-method_args.data.rb:12:FixedArgsMethods#by_attr_writer= (value)
-method_args.data.rb:13:FixedArgsMethods#private_meth (x)
-method_args.data.rb:16:FixedArgsMethods.singleton_attr_accessor
-method_args.data.rb:16:FixedArgsMethods.singleton_attr_accessor= (value)
-method_args.data.rb:17:FixedArgsMethods.singleton_defmethod (...)
-method_args.data.rb:22:VariableArgsMethods#s (a1, *splat)
-method_args.data.rb:23:VariableArgsMethods#sb (a1, *splat, &block)
-method_args.data.rb:24:VariableArgsMethods#d (a1, default = nil)
-method_args.data.rb:25:VariableArgsMethods#ds (a1, default = nil, *splat)
-method_args.data.rb:26:VariableArgsMethods#dsb (a1, default = nil, *splat, &block)
-method_args.data.rb:27:VariableArgsMethods#db (a1, default = nil, &block)
-method_args.data.rb:31:Fixnum#method_in_Fixnum (arg1, arg2)
-method_args.data.rb:32:Fixnum.singleton_method_in_Fixnum (arg1, arg2)
-method_args.data.rb:35:Bignum#method_in_Bignum (arg1, arg2)
-method_args.data.rb:38:Float#method_in_Float (arg1, arg2)
-method_args.data.rb:41:Symbol#method_in_Symbol (arg1, arg2)
-method_args.data.rb:44:Binding#method_in_Binding (arg1, arg2)
-method_args.data.rb:47:UnboundMethod#method_in_UnboundMethod (arg1, arg2)
-method_args.data.rb:50:Method#method_in_Method (arg1, arg2)
-method_args.data.rb:53:Proc#method_in_Proc (arg1, arg2)
-method_args.data.rb:56:Continuation#method_in_Continuation (arg1, arg2)
-method_args.data.rb:59:Thread#method_in_Thread (arg1, arg2)
-method_args.data.rb:66:TrueClass#method_in_TrueClass (arg1, arg2)
-method_args.data.rb:69:NilClass#method_in_NilClass (arg1, arg2)
-method_args.data.rb:72:Struct#method_in_Struct (arg1, arg2)
-Digest::Base#method_in_Digest_Base (...)
-AnAbstractClass#method_in_AnAbstractClass (...)
-method_args.data.rb:93:include AClass <= VariableArgsMethods
-method_args.data.rb:94:extend AClass <- VariableArgsMethods
-method_args.data.rb:97:class ASubClass < AClass
-method_args.data.rb:100:class <Struct: a,b> < Struct
-method_args.data.rb:101:class SubclassOfStructA < StructA
-method_args.data.rb:102:SubclassOfStructA#method_in_b
-method_args.data.rb:104:class <Struct: c> < Struct
-method_args.data.rb:104:class StructSubclass < <Struct: c>
-method_args.data.rb:105:StructSubclass#method_in_c
-XXX
-
-  # To avoid dependency of pwd.
-  module StripDir
-    def strip_dir!
-      slice! %r!^.*/!
-      self
-    end
-  end
-
-  @@expected.each do |line|
-    begin
-      file_lineno_klass_meth, rest = line.split(/\s+/,2)
-      if file_lineno_klass_meth =~ /:/
-        file, lineno, klass_meth = file_lineno_klass_meth.split(/:/)
-        klass_meth = rest if %w[class include extend].include? klass_meth
-      else                        # filename/lineno is unknown
-        klass_meth = file_lineno_klass_meth
-      end
-
-      test_method_name = "test_" + klass_meth
-      define_method(test_method_name) do 
-        actual = @@result.grep(/#{klass_meth}/)[0].extend(StripDir).strip_dir!
-        assert_equal line, actual
-      end
-    rescue Exception
-    end
-  end
-  
-  def test_all_tests
-    assert_equal @@expected.length, @@result.length, @@result.join("\n")
-  end
-
-  def test_without_n_option
-    first_line = "FixedArgsMethods.singleton (a1)"
-    command_output = `ruby '#{SCRIPT}'  '#{DATAFILE}'`
-    assert_match(/\A#{Regexp.quote(first_line)}\n/, command_output)
-  end
-end
-
-
-class TestTAGS < Test::Unit::TestCase
-  include MethodArgsScriptConfig
-
-  @@TAGS = `ruby '#{SCRIPT}' -t '#{DATAFILE}'`
-  def test_filename
-    # check whether full path is passed.
-    assert_match %r!^\cl\n/.+method_args.data.rb,\d!, @@TAGS
-  end
-
-  def test_singleton_method
-    # including line/byte test
-    assert @@TAGS.include?("  def self.singleton(a1) end::FixedArgsMethods.singleton
3,45")
-  end
-
-  def test_instance_method
-    assert @@TAGS.include?("  def initialize(arg) end::FixedArgsMethods#initialize
4,74")
-  end
-
-  def test_include
-    assert_match(/^  include VariableArgsMethods::AClass
/, @@TAGS)
-  end
-
-  def test_extend
-    assert_match(/^  extend VariableArgsMethods::AClass
/, @@TAGS)
-  end
-
-  def test_inheritance
-    assert_match(/^class ASubClass < AClass::ASubClass
/, @@TAGS)
-  end
-end
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/test_options.rb b/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/test_options.rb
deleted file mode 100644
index 8751516f2..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/test_options.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-$: << ".." << "../lib"
-require 'rcodetools/options'
-require 'test/unit'
-require 'tmpdir'
-require 'fileutils'
-
-class TestOptionHandler < Test::Unit::TestCase
-  include Rcodetools
-  include OptionHandler
-
-  def include_paths_check
-    options = { :include_paths => [] }
-    auto_include_paths options[:include_paths], Dir.pwd
-    assert options[:include_paths].include?("#{@basedir}/lib")
-    assert options[:include_paths].include?("#{@basedir}/bin")
-  end
-
-  def test_auto_include_paths
-    Dir.chdir(Dir.tmpdir) do
-      begin
-        FileUtils.mkdir_p ["project", "project/lib/project", "project/bin", "project/share"]
-        open("project/Rakefile","w"){}
-        @basedir = File.expand_path "project"
-        Dir.chdir("project/lib/project/") { include_paths_check }
-        Dir.chdir("project/lib/") { include_paths_check }
-        Dir.chdir("project/bin/") { include_paths_check }
-        Dir.chdir("project/") { include_paths_check }
-      ensure
-        FileUtils.rm_rf "project"
-      end
-    end
-  end
-end
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/test_ruby_toggle_file.rb b/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/test_ruby_toggle_file.rb
deleted file mode 100644
index e7960f9a3..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/test_ruby_toggle_file.rb
+++ /dev/null
@@ -1,174 +0,0 @@
-require 'fileutils'
-require 'test/unit'
-require 'ruby_toggle_file'
-require 'tmpdir'
-
-class TestRubyToggleFile < Test::Unit::TestCase
-  WORK_DIR = "#{Dir.tmpdir}/zdsfwfwejiotest".freeze
-  FileUtils.rm_rf WORK_DIR
-
-  def teardown
-    FileUtils.rm_rf WORK_DIR
-  end
-
-  def create(*files)
-    for file in files.map{|f| _(f) }
-      FileUtils.mkpath(File.dirname(file))
-      open(file,"w"){}
-    end
-  end
-
-  def _(path)                   # make full path
-    WORK_DIR + "/" + path
-  end
-
-  ###########################################################################
-  # naming convention                                                       #
-  # test_METHOD__EXISTP__IMPLEMENTDIR_TESTDIR                               #
-  ###########################################################################
-  def test_test_file__exist__lib_test
-    create "lib/zero.rb", "test/test_zero.rb"
-    rtf = RubyToggleFile.new
-    assert_equal _("test/test_zero.rb"), rtf.ruby_toggle_file(_("lib/zero.rb"))
-  end
-
-  def test_test_file__exist__libone_testone
-    create "lib/one/one.rb", "test/one/test_one.rb"
-    rtf = RubyToggleFile.new
-    assert_equal _("test/one/test_one.rb"), rtf.ruby_toggle_file(_("lib/one/one.rb"))
-  end
-
-  def test_test_file__exist__libtwo_test
-    create "lib/two/two.rb", "test/test_two.rb"
-    rtf = RubyToggleFile.new
-    assert_equal _("test/test_two.rb"), rtf.ruby_toggle_file(_("lib/two/two.rb"))
-  end
-
-  def test_test_file__exist__top_test
-    create "three.rb", "test_three.rb"
-    rtf = RubyToggleFile.new
-    assert_equal _("test_three.rb"), rtf.ruby_toggle_file(_("three.rb"))
-  end
-
-  def test_test_file__not_exist__top
-    create "four.rb"
-    rtf = RubyToggleFile.new
-    assert_equal _("test_four.rb"), rtf.ruby_toggle_file(_("four.rb"))
-  end
-
-  def test_test_file__not_exist__lib
-    create "lib/five.rb"
-    rtf = RubyToggleFile.new
-    assert_equal _("test/test_five.rb"), rtf.ruby_toggle_file(_("lib/five.rb"))
-  end
-
-  def test_test_file__not_exist__libsixsix
-    create "lib/six/six/six.rb"
-    rtf = RubyToggleFile.new
-    assert_equal _("test/six/six/test_six.rb"), rtf.ruby_toggle_file(_("lib/six/six/six.rb"))
-  end
-
-  def test_implementation_file__exist__lib_test
-    create "lib/zero.rb", "test/test_zero.rb"
-    rtf = RubyToggleFile.new
-    assert_equal _("lib/zero.rb"), rtf.ruby_toggle_file(_("test/test_zero.rb"))
-  end
-
-  def test_implementation_file__exist__libone_testone
-    create "lib/one/one.rb", "test/one/test_one.rb"
-    rtf = RubyToggleFile.new
-    assert_equal _("lib/one/one.rb"), rtf.ruby_toggle_file(_("test/one/test_one.rb"))
-  end
-
-  def test_implementation_file__exist__libtwo_test
-    create "lib/two/two.rb", "test/test_two.rb"
-    rtf = RubyToggleFile.new
-    assert_equal _("lib/two/two.rb"), rtf.ruby_toggle_file(_("test/test_two.rb"))
-  end
-
-  def test_implementation_file__exist__top_test
-    create "three.rb", "test_three.rb"
-    rtf = RubyToggleFile.new
-    assert_equal _("three.rb"), rtf.ruby_toggle_file(_("test_three.rb"))
-  end
-
-  def test_implementation_file__not_exist__none_top
-    create "test_seven.rb"
-    rtf = RubyToggleFile.new
-    assert_equal _("seven.rb"), rtf.ruby_toggle_file(_("test_seven.rb"))
-  end
-
-  def test_implementation_file__not_exist__none_test
-    create "test/test_eight.rb"
-    rtf = RubyToggleFile.new
-    assert_equal _("lib/eight.rb"), rtf.ruby_toggle_file(_("test/test_eight.rb"))
-  end
-
-  def test_implementation_file__not_exist__none_testninenine
-    create "test/nine/nine/nine.rb"
-    rtf = RubyToggleFile.new
-    assert_equal _("lib/nine/nine/nine.rb"), rtf.ruby_toggle_file(_("test/nine/nine/test_nine.rb"))
-  end
-
-  ###########################################################################
-  # Rails test                                                              #
-  ###########################################################################
-  def test_test_file__rails_controllers
-    create "app/controllers/c.rb", "test/functional/c_test.rb"
-    rtf = RubyToggleFile.new
-    assert_equal _("test/functional/c_test.rb"), rtf.ruby_toggle_file(_("app/controllers/c.rb"))
-  end
-
-  def test_test_file__rails_models
-    create "app/models/m.rb", "test/unit/m_test.rb"
-    rtf = RubyToggleFile.new
-    assert_equal _("test/unit/m_test.rb"), rtf.ruby_toggle_file(_("app/models/m.rb"))
-  end
-
-  def test_test_file__rails_lib
-    create "lib/l.rb", "test/unit/test_l.rb", "app/models/m.rb"
-    rtf = RubyToggleFile.new
-    assert_equal _("test/unit/test_l.rb"), rtf.ruby_toggle_file(_("lib/l.rb"))
-  end
-
-
-  def test_implementation_file__rails_controllers
-    create "app/controllers/c.rb", "test/functional/c_test.rb"
-    rtf = RubyToggleFile.new
-    assert_equal _("app/controllers/c.rb"), rtf.ruby_toggle_file(_("test/functional/c_test.rb"))
-  end
-
-  def test_implementation_file__rails_models
-    create "app/models/m.rb", "test/unit/m_test.rb"
-    rtf = RubyToggleFile.new
-    assert_equal _("app/models/m.rb"), rtf.ruby_toggle_file(_("test/unit/m_test.rb"))
-  end
-
-  def test_implementation_file__rails_lib
-    create "lib/l.rb", "test/unit/test_l.rb", "app/models/m.rb"
-    rtf = RubyToggleFile.new
-    assert_equal _("lib/l.rb"), rtf.ruby_toggle_file(_("test/unit/test_l.rb"))
-  end
-end
-
-
-class TestRunHooksWithArgsUntilSuccess < Test::Unit::TestCase
-  def m001(x) nil end
-  private
-  def m002(x) false end
-  def m003(x) 100*x end
-  def m004(x) 200 end
-
-  public
-  def test_run_hooks_with_args_until_success__m003
-    assert_equal 1000, run_hooks_with_args_until_success(/^m\d+$/, 10)
-  end
-
-  def test_run_hooks_with_args_until_success__m001
-    assert_nil   run_hooks_with_args_until_success(/^m001$/, 10)
-  end
-
-  def test_run_hooks_with_args_until_success__m004
-    assert_equal 200, run_hooks_with_args_until_success(/^m004$/, 10)
-  end
-end
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/test_xmpfilter.rb b/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/test_xmpfilter.rb
deleted file mode 100644
index 0ed9aa6b8..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/test_xmpfilter.rb
+++ /dev/null
@@ -1,221 +0,0 @@
-
-require 'test/unit'
-$: << ".." << "../lib"
-require "rcodetools/xmpfilter"
-require 'rubygems'
-require 'mocha'
-
-class TestXMPFilter < Test::Unit::TestCase
-  include Rcodetools
-  def test_extract_data__results
-    marker = XMPFilter::MARKER
-    str = <<-EOF
-#{marker}[1] => Fixnum 42
-#{marker}[1] => Fixnum 0
-#{marker}[1] ==> var
-#{marker}[1] ==> var2
-#{marker}[4] ==> var3
-#{marker}[2] ~> some exception
-#{marker}[10] => Fixnum 42
-    EOF
-    xmp = XMPFilter.new
-    data = xmp.extract_data(str)
-    assert_equal([[1, [["Fixnum", "42"], ["Fixnum", "0"]]], [10, [["Fixnum", "42"]]]], data.results.sort)
-  end
-
-  def test_extract_data__exceptions
-    marker = XMPFilter::MARKER
-    str = <<-EOF
-#{marker}[1] => Fixnum 42
-#{marker}[1] => Fixnum 0
-#{marker}[1] ==> var
-#{marker}[1] ==> var2
-#{marker}[4] ==> var3
-#{marker}[2] ~> some exception
-#{marker}[10] => Fixnum 42
-    EOF
-    xmp = XMPFilter.new
-    data = xmp.extract_data(str)
-    assert_equal([[2, ["some exception"]]], data.exceptions.sort)
-  end
-
-  def test_extract_data__bindings
-    marker = XMPFilter::MARKER
-    str = <<-EOF
-#{marker}[1] => Fixnum 42
-#{marker}[1] => Fixnum 0
-#{marker}[1] ==> var
-#{marker}[1] ==> var2
-#{marker}[4] ==> var3
-#{marker}[2] ~> some exception
-#{marker}[10] => Fixnum 42
-    EOF
-    xmp = XMPFilter.new
-    data = xmp.extract_data(str)
-    assert_equal([[1, ["var", "var2"]], [4, ["var3"]]], data.bindings.sort)
-  end
-
-  def test_interpreter_command
-    xmp = XMPFilter.new(:interpreter=>"ruby", :detect_rct_fork => false)
-    assert_equal(%w[ruby -w], xmp.interpreter_command)
-  end
-
-  def test_interpreter_command_detect_rct_fork
-    Fork.stubs(:run?).returns true
-    xmp = XMPFilter.new(:interpreter=>"ruby", :detect_rct_fork => true)
-    assert_equal(%w[ruby -S rct-fork-client], xmp.interpreter_command)
-  end
-
-  def test_interpreter_command_use_rbtest
-    xmp = XMPFilter.new(:interpreter=>"ruby", :use_rbtest => true)
-    assert_equal(%w[ruby -S rbtest], xmp.interpreter_command)
-  end
-
-  def test_initialize__test_script_1
-    XMPFilter.any_instance.stubs(:safe_require_code).returns("require 'test/unit'")
-    xmp = XMPFilter.new(:test_script=>"/path/to/test/test_ruby_toggle_file.rb",
-                         :test_method=>"test_implementation_file_file_exist",
-                         :filename=>"/path/to/lib/ruby_toggle_file.rb")
-
-    evals_expected = [
-      %q!$LOADED_FEATURES << "ruby_toggle_file.rb"!,
-      %q!require 'test/unit'!,
-      %q!load "/path/to/test/test_ruby_toggle_file.rb"!,
-      %q!Test::Unit::AutoRunner.run(false, nil, ["-n", "test_implementation_file_file_exist"])!
-    ]
-    assert_equal evals_expected, xmp.instance_variable_get(:@evals)
-  end
-
-  def test_initialize__test_script_2
-    XMPFilter.any_instance.stubs(:safe_require_code).returns("require 'test/unit'")
-    xmp = XMPFilter.new(:test_script=>"/path/to/test_ruby_toggle_file.rb",
-                         :test_method=>"test_implementation_file_file_exist",
-                         :filename=>"/path/to/ruby_toggle_file.rb")
-
-    evals_expected = [
-      %q!$LOADED_FEATURES << "ruby_toggle_file.rb"!,
-      %q!require 'test/unit'!,
-      %q!load "/path/to/test_ruby_toggle_file.rb"!,
-      %q!Test::Unit::AutoRunner.run(false, nil, ["-n", "test_implementation_file_file_exist"])!
-    ]
-    assert_equal evals_expected, xmp.instance_variable_get(:@evals)
-  end
-
-  def test_initialize__test_script_3
-    test_script = File.join(File.dirname(__FILE__), "data/sample_test_script.rb")
-    filename = File.join(File.dirname(__FILE__), "data/sample.rb")
-    XMPFilter.any_instance.stubs(:safe_require_code).returns("require 'test/unit'")
-    xmp = XMPFilter.new(:test_script=>test_script, :test_method=>"4", :filename=>filename)
-
-    evals_expected = [
-      %q!$LOADED_FEATURES << "sample.rb"!,
-      %q!require 'test/unit'!,
-      %Q!load #{test_script.dump}!,
-      %q!Test::Unit::AutoRunner.run(false, nil, ["-n", "test_sample0"])!
-    ]
-    assert_equal evals_expected, xmp.instance_variable_get(:@evals)
-  end
-
-  def test_initialize__test_script__filename_eq_test_script
-    test_script = File.join(File.dirname(__FILE__), "data/sample_test_script.rb")
-    filename = test_script
-    xmp = XMPFilter.new(:test_script=>test_script, :test_method=>"4", :filename=>filename)
-
-    evals_expected = [
-      %q!Test::Unit::AutoRunner.run(false, nil, ["-n", "test_sample0"])!
-    ]
-    assert_equal evals_expected, xmp.instance_variable_get(:@evals)
-  end
-
-  def test_get_test_method_from_lineno
-    file = File.join(File.dirname(__FILE__), "data/sample_test_script.rb")
-    xmp = XMPFilter.new
-    assert_equal("test_sample0", xmp.get_test_method_from_lineno(file, 4))
-    assert_equal("test_sample1", xmp.get_test_method_from_lineno(file, 7))
-    assert_equal("test_sample1", xmp.get_test_method_from_lineno(file, 8))
-    assert_equal(nil, xmp.get_test_method_from_lineno(file, 1))
-  end
-
-  # Use methods to avoid confusing syntax highlighting
-  def beg() "=begin" end
-  def ed()  "=end"   end
-  
-  def test_s_detect_rbtest_1
-    rbtest_script_1 = <<XXX
-#{beg} test_0
-assert f(10)
-#{ed}
-def f(x) x*100 end
-XXX
-
-    opts = {:detect_rbtest => true}
-    assert_equal true, XMPFilter.detect_rbtest(rbtest_script_1, opts)
-    assert_equal true, opts[:use_rbtest]
-    opts = {:detect_rbtest => false}
-    assert_equal false, XMPFilter.detect_rbtest(rbtest_script_1, opts)
-    assert_equal false, opts[:use_rbtest]
-    opts = {:detect_rbtest => false, :use_rbtest => true}
-    assert_equal true, XMPFilter.detect_rbtest(rbtest_script_1, opts)
-    assert_equal true, opts[:use_rbtest]
-  end
-
-  def test_s_detect_rbtest_2
-    rbtest_script_2 = <<XXX
-def f(x) x*100 end
-#{beg} test_0
-assert f(10)
-#{ed}
-XXX
-    opts = {:detect_rbtest => true}
-    assert_equal true, XMPFilter.detect_rbtest(rbtest_script_2, opts)
-    assert_equal true, opts[:use_rbtest]
-    opts = {:detect_rbtest => false}
-    assert_equal false, XMPFilter.detect_rbtest(rbtest_script_2, opts)
-    assert_equal false, opts[:use_rbtest]
-  end
-  
-  def test_s_detect_rbtest_3
-    no_rbtest_script = <<XXX
-def f(x) x*100 end
-XXX
-
-    opts = {:detect_rbtest => true}
-    assert_equal false, XMPFilter.detect_rbtest(no_rbtest_script, opts)
-    assert_equal false, opts[:use_rbtest]
-    opts = {:detect_rbtest => false}
-    assert_equal false, XMPFilter.detect_rbtest(no_rbtest_script, opts)
-    assert_equal false, opts[:use_rbtest]
-  end
-
-end
-
-class TestTempScript < Test::Unit::TestCase
-  def test(script)
-    Rcodetools::XMPFilter.new.__send__(:split_shbang,script)
-  end
-
-  def test_none
-    assert_equal [[], ["1\n"]], test(<<EOS)
-1
-EOS
-  end
-  def test_shbang
-    assert_equal [["#!/usr/bin/ruby\n"], ["1\n"]], test(<<EOS)
-#!/usr/bin/ruby
-1
-EOS
-  end
-  def test_magic_comment
-    assert_equal [["# -*- coding: utf-8 -*-\n"], ["1\n"]], test(<<EOS)
-# -*- coding: utf-8 -*-
-1
-EOS
-  end
-  def test_both
-    assert_equal [["#!/usr/bin/ruby\n", "# -*- coding: utf-8 -*-\n"], ["1\n"]], test(<<EOS)
-#!/usr/bin/ruby
-# -*- coding: utf-8 -*-
-1
-EOS
-  end
-end
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/test_xmptestunitfilter.rb b/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/test_xmptestunitfilter.rb
deleted file mode 100644
index d744e495b..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/test_xmptestunitfilter.rb
+++ /dev/null
@@ -1,86 +0,0 @@
-
-require 'test/unit'
-$: << ".." << "../lib"
-require "rcodetools/xmptestunitfilter"
-
-class TestXMPTestUnitFilter < Test::Unit::TestCase
-  include Rcodetools
-
-  ANNOTATION_VAR_INFERENCE_INPUT = <<EOF
-arr = []
-X = Struct.new(:foo, :bar)
-x = X.new("foo", "bar")
-arr << x
-arr                                                # \=>
-arr.last                                           # \=>
-EOF
-  ANNOTATION_VAR_INFERENCE_OUTPUT = <<EOF
-arr = []
-X = Struct.new(:foo, :bar)
-x = X.new(\"foo\", \"bar\")
-arr << x
-assert_equal([x], arr)
-assert_kind_of(Array, arr)
-assert_equal(\"[#<struct X foo=\\\"foo\\\", bar=\\\"bar\\\">]\", arr.inspect)
-assert_equal(x, arr.last)
-assert_kind_of(X, arr.last)
-assert_equal(\"#<struct X foo=\\\"foo\\\", bar=\\\"bar\\\">\", arr.last.inspect)
-EOF
-
-  def test_annotation_var_inference
-    xmp = XMPTestUnitFilter.new
-    assert_equal(ANNOTATION_VAR_INFERENCE_OUTPUT, 
-                 xmp.annotate(ANNOTATION_VAR_INFERENCE_INPUT).join(""))
-  end
-
-  def test_equality_assertions
-    xmp = XMPTestUnitFilter.new
-    assert_equal(["a = 1\n", "assert_equal(1, a)"], xmp.annotate("a = 1\na # \=>"))
-    assert_equal(["a = {1,2}\n", "assert_equal({1=>2}, a)"], 
-                 xmp.annotate("a = {1,2}\na # \=>"))
-    assert_equal(["a = [1,2]\n", "assert_equal([1, 2], a)"], 
-                 xmp.annotate("a = [1,2]\na # \=>"))
-    assert_equal(["a = 'foo'\n", "assert_equal(\"foo\", a)"], 
-                 xmp.annotate("a = 'foo'\na # \=>"))
-    assert_equal(["a = 1.0\n", "assert_in_delta(1.0, a, 0.0001)"], 
-                 xmp.annotate("a = 1.0\na # \=>"))
-  end
-
-  def test_raise_assertion
-    code = <<EOF
-class NoGood < Exception; end
-raise NoGood                                       # \=>
-EOF
-    xmp = XMPTestUnitFilter.new
-    assert_equal(["class NoGood < Exception; end\n", 
-                 "assert_raise(NoGood){raise NoGood}\n"], xmp.annotate(code))
-  end
-
-  def test_assert_nil
-    xmp = XMPTestUnitFilter.new
-    assert_equal(["a = nil\n", "assert_nil(a)"], xmp.annotate("a = nil\na # \=>"))
-  end
-
-  def test_poetry_mode
-    code = <<EOF
-a = 1
-a # \=>
-a = 1.0
-a # \=>
-raise "foo" # \=>
-a = nil
-a # \=>
-EOF
-    output = <<EOF
-a = 1
-assert_equal 1, a
-a = 1.0
-assert_in_delta 1.0, a, 0.0001
-assert_raise(RuntimeError){raise "foo"}
-a = nil
-assert_nil a
-EOF
-    xmp = XMPTestUnitFilter.new(:use_parentheses => false)
-    assert_equal(output, xmp.annotate(code).join)
-  end
-end
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/tmp_functional.rb b/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/tmp_functional.rb
deleted file mode 100644
index 339fdfc2b..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/tmp_functional.rb
+++ /dev/null
@@ -1,162 +0,0 @@
-require 'test/unit'
-
-module TestFunctional
-  DIR = File.expand_path(File.dirname(__FILE__))
-  LIBDIR = File.expand_path(DIR + '/../lib')
-  
-  module DefineFunctionalTests
-    def define_functional_tests(bin, exec, tests)
-      tests.each_pair do |test, opts|
-        define_method("test_#{test}") do
-          
-          output = `ruby -I#{LIBDIR} #{exec} #{opts.join(" ")} #{DIR}/data/#{test}-input.rb`
-          outputfile = "#{DIR}/data/#{test}-output.rb"
-          taffile = "#{DIR}/data/#{bin}/#{test}.taf"
-          open(taffile, "w") do |f|
-            f.puts "=========="
-            f.puts test
-            f.puts "=========="
-            f.puts bin + " " + opts.join(" ")
-            f.puts "=========="
-            f.puts File.read("#{DIR}/data/#{test}-input.rb")
-            f.puts "=========="
-            f.puts File.read("#{DIR}/data/#{test}-output.rb")
-          end
-#          assert_equal(File.read(outputfile), output)
-        end
-      end 
-    end
-  end
-
-  class TestXmpfilter < Test::Unit::TestCase
-    extend DefineFunctionalTests
-    tests = {
-      :simple_annotation => [], :unit_test => ["-u"], :rspec => ["-s"],
-      :no_warnings => ["--no-warnings"], :bindings => ["--poetry", "-u"],
-      :add_markers => ["-m"], :unit_test_rbtest => ["-u", "--rbtest"],
-      :unit_test_detect_rbtest => ["-u", "--detect-rbtest"],
-      :unit_test_detect_rbtest2 => ["--detect-rbtest"],
-    }
-    define_functional_tests "xmpfilter", File.expand_path(DIR + '/../bin/xmpfilter'), tests
-  end
-
-  class TestRctComplete < Test::Unit::TestCase
-    extend DefineFunctionalTests
-    tests = {
-      :completion_rbtest => [ "--rbtest", "--line=6" ],
-      :completion_detect_rbtest => [ "--detect-rbtest", "--line=6" ],
-      :completion_detect_rbtest2 => [ "--detect-rbtest", "--line=1" ],
-    }
-    define_functional_tests "rct-complete", File.expand_path(DIR + '/../bin/rct-complete'), tests
-  end
-
-  class TestRctDoc < Test::Unit::TestCase
-    extend DefineFunctionalTests
-    tests = {
-      :doc_rbtest => [ "--rbtest", "--line=6" ],
-      :doc_detect_rbtest => [ "--detect-rbtest", "--line=1" ],
-      :doc_detect_rbtest2 => [ "--detect-rbtest", "--line=6" ],
-    }
-    define_functional_tests "rct-doc", File.expand_path(DIR + '/../bin/rct-doc'), tests
-  end
-
-
-  # Other tests are in test_run.rb
-  class TestRctCompleteTDC < Test::Unit::TestCase
-    test = :completion_in_method
-    inputfile = "#{DIR}/data/#{test}-input.rb"
-    outputfile = "#{DIR}/data/#{test}-output.rb"
-    test_script = "#{DIR}/data/#{test}-test.rb"
-    common_opts = ["--filename #{inputfile}", "--line 2"]
-    right_output = File.read(outputfile)
-    wrong_output = "\n"
-
-    tests = {
-      :completion_in_method__testscript =>
-        [ common_opts + ["-t #{test_script}"], right_output ],
-      :completion_in_method__testmethod =>
-        [ common_opts + ["-t #{test_script}@test_fooz"], right_output ],
-      :completion_in_method__wrong_testmethod =>
-        [ common_opts + ["-t #{test_script}@test_NOT_FOUND"], wrong_output ],
-    }
-    exec = File.expand_path(DIR + '/../bin/rct-complete')
-#     tests.each_pair do |test, (opts, expected)|
-#       define_method("test_#{test}") do 
-#         output = `ruby -I#{LIBDIR} #{exec} #{opts.join(" ")} #{inputfile}`
-        
-#         taffile = "#{DIR}/data/#{bin}/#{test}.taf"
-#         open(taffile, "w") do |f|
-#           f.puts "=========="
-#           f.puts test
-#           f.puts "=========="
-#           f.puts bin + " " + opts.join(" ")
-#           f.puts "=========="
-#           f.puts File.read("#{DIR}/data/#{test}-input.rb")
-#           f.puts "=========="
-#           f.puts File.read("#{DIR}/data/#{test}-output.rb")
-#         end
-#       end
-#     end
-
-    test=:completion_in_method__testscript
-    define_method("test_#{test}") do
-      taffile = "#{DIR}/data/rct-complete-TDC/completion_in_method__testscript.taf"
-      open(taffile, "w") do |f|
-        opts = tests[test]
-        f.puts "=========="
-        f.puts test
-        f.puts "=========="
-        f.puts "rct-complete " + opts.join(" ")
-        f.puts "=========="
-        test0 = :completion_in_method
-        f.puts File.read("#{DIR}/data/#{test0}-input.rb")
-        f.puts "=========="
-        f.puts File.read("#{DIR}/data/#{test0}-output.rb")
-        f.puts "=========="
-        f.puts File.read("#{DIR}/data/#{test0}-test.rb")
-      end
-      
-    end
-
-    test=:completion_in_method__testmethod
-    define_method("test_#{test}") do
-      taffile = "#{DIR}/data/rct-complete-TDC/completion_in_method__testmethod.taf"
-      open(taffile, "w") do |f|
-        opts = tests[test]
-        f.puts "=========="
-        f.puts test
-        f.puts "=========="
-        f.puts "rct-complete " + opts.join(" ")
-        f.puts "=========="
-        test0 = :completion_in_method
-        f.puts File.read("#{DIR}/data/#{test0}-input.rb")
-        f.puts "=========="
-        f.puts File.read("#{DIR}/data/#{test0}-output.rb")
-        f.puts "=========="
-        f.puts File.read("#{DIR}/data/#{test0}-test.rb")
-      end
-      
-    end
-
-    test=:completion_in_method__wrong_testmethod
-    define_method("test_#{test}") do
-      taffile = "#{DIR}/data/rct-complete-TDC/completion_in_method__wrong_testmethod.taf"
-      open(taffile, "w") do |f|
-        opts = tests[test]
-        f.puts "=========="
-        f.puts test
-        f.puts "=========="
-        f.puts "rct-complete " + opts.join(" ")
-        f.puts "=========="
-        test0 = :completion_in_method
-        f.puts File.read("#{DIR}/data/#{test0}-input.rb")
-        f.puts "=========="
-        f.puts 
-        f.puts "=========="
-        f.puts File.read("#{DIR}/data/#{test0}-test.rb")
-      end
-      
-    end
-
-  end
-end
diff --git a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/tmp_run.rb b/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/tmp_run.rb
deleted file mode 100644
index b3bed0d01..000000000
--- a/bundles/ruby.tmbundle/Support/vendor/rcodetools/test/tmp_run.rb
+++ /dev/null
@@ -1,66 +0,0 @@
-require 'test/unit'
-require 'rcodetools/xmpfilter'
-require 'rcodetools/xmptestunitfilter'
-require 'rcodetools/completion'
-require 'rcodetools/doc'
-require 'rcodetools/options'
-require 'stringio'
-
-class TestRun < Test::Unit::TestCase
-  include Rcodetools
-  DIR = File.expand_path(File.dirname(__FILE__))
-
-  tests = {
-#    :rspec_poetry      => {:klass => XMPRSpecFilter,    :interpreter     => "spec", :use_parentheses => false},
-    :rspec_poetry => ["xmpfilter", "-s --poetry"],
-#    :unit_test_poetry  => {:klass => XMPTestUnitFilter, :use_parentheses => false},
-    :unit_test_poetry => ["xmpfilter", "-u --poetry"],
-    
-#    :completion       => {:klass => XMPCompletionFilter,      :lineno => 1},
-    :completion => ["rct-complete", "-C --line=1"],
-#    :completion_emacs => {:klass => XMPCompletionEmacsFilter, :lineno => 1},
-    :completion_emacs => ["rct-complete", "--completion-emacs --line=1"],
-#    :completion_emacs_icicles => {:klass => XMPCompletionEmacsIciclesFilter, :lineno => 1},
-    :completion_emacs_icicles => ["rct-complete","--completion-emacs-icicles --line=1"],
-#    :completion_class_info => {:klass => XMPCompletionClassInfoFilter, :lineno => 1},
-    :completion_class_info => ["rct-complete", "--completion-class-info --line=1"],
-#    :completion_class_info_no_candidates => {:klass => XMPCompletionClassInfoFilter, :lineno => 1},
-    :completion_class_info_no_candidates => ["rct-complete", "--completion-class-info --line=1"],
-    
-#     :doc      => {:klass => XMPDocFilter,     :lineno => 1},
-#     :refe     => {:klass => XMPReFeFilter,    :lineno => 1},
-#     :ri       => {:klass => XMPRiFilter,      :lineno => 1},
-#     :ri_emacs => {:klass => XMPRiEmacsFilter, :lineno => 1},
-#     :ri_vim   => {:klass => XMPRiVimFilter,   :lineno => 1},
-    :doc => ["rct-doc", "-D --line=1"],
-    :refe => ["rct-doc", "--refe --line=1"],
-    :ri => ["rct-doc", "--ri --line=1"],
-    :ri_emacs => ["rct-doc", "--ri-emacs --line=1"],
-    :ri_vim => ["rct-doc", "--ri-vim --line=1"],
-    
-  }
-  DIR = File.expand_path(File.dirname(__FILE__))
-  LIBDIR = File.expand_path(DIR + '/../lib')
-
-  tests.each_pair do |test, (bin,opts)|
-    define_method("test_#{test}") do
-      inputfile = "#{DIR}/data/#{test}-input.rb"
-      outputfile = "#{DIR}/data/#{test}-output.rb"
-
-#       exec = File.expand_path(DIR + '/../bin/xmpfilter')
-#       output = `ruby -I#{LIBDIR} #{exec} #{opts} #{DIR}/data/#{test}-input.rb`
-#       outputfile = "#{DIR}/data/#{test}-output.rb"
-      taffile = "#{DIR}/data/#{bin}/#{test}.taf"
-      open(taffile, "w") do |f|
-        f.puts "=========="
-        f.puts test
-        f.puts "=========="
-        f.puts bin + " " + opts
-        f.puts "=========="
-        f.puts File.read("#{DIR}/data/#{test}-input.rb")
-        f.puts "=========="
-        f.puts File.read("#{DIR}/data/#{test}-output.rb")
-      end
-    end
-  end 
-end
diff --git a/bundles/ruby.tmbundle/Syntaxes/Ruby.plist b/bundles/ruby.tmbundle/Syntaxes/Ruby.plist
deleted file mode 100644
index 8070bb973..000000000
--- a/bundles/ruby.tmbundle/Syntaxes/Ruby.plist
+++ /dev/null
@@ -1,2853 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>comment</key>
-	<string>
-	TODO: unresolved issues
-
-	text:
-	"p &lt;&lt; end
-	print me!
-	end"
-	symptoms:
-	not recognized as a heredoc
-	solution:
-	there is no way to distinguish perfectly between the &lt;&lt; operator and the start
-	of a heredoc. Currently, we require assignment to recognize a heredoc. More
-	refinement is possible.
-	• Heredocs with indented terminators (&lt;&lt;-) are always distinguishable, however.
-	• Nested heredocs are not really supportable at present
-
-	text:
-	print &lt;&lt;-'THERE' 
-	This is single quoted. 
-	The above used #{Time.now} 
-	THERE 
-	symtoms:
-	From Programming Ruby p306; should be a non-interpolated heredoc.
-	
-	text:
-	"a\332a"
-	symptoms:
-	'\332' is not recognized as slash3.. which should be octal 332.
-	solution:
-	plain regexp.. should be easy.
-
-    text:
-    val?(a):p(b)
-    val?'a':'b'
-    symptoms:
-    ':p' is recognized as a symbol.. its 2 things ':' and 'p'.
-    :'b' has same problem.
-    solution:
-    ternary operator rule, precedence stuff, symbol rule.
-    but also consider 'a.b?(:c)' ??
-</string>
-	<key>fileTypes</key>
-	<array>
-		<string>rb</string>
-		<string>rbx</string>
-		<string>rjs</string>
-		<string>Rakefile</string>
-		<string>rake</string>
-		<string>cgi</string>
-		<string>fcgi</string>
-		<string>gemspec</string>
-		<string>irbrc</string>
-		<string>capfile</string>
-	</array>
-	<key>firstLineMatch</key>
-	<string>^#!/.*\bruby</string>
-	<key>foldingStartMarker</key>
-	<string>(?x)^
-	    (\s*+
-	        (module|class|def(?!.*\bend\s*$)
-	        |unless|if
-	        |case
-	        |begin
-	        |for|while|until
-	         |^=begin
-	        |(  "(\\.|[^"])*+"          # eat a double quoted string
-	         | '(\\.|[^'])*+'        # eat a single quoted string
-	         |   [^#"']                # eat all but comments and strings
-	         )*
-	         (                        \s   (do|begin|case)
-	         | (?&lt;!\$)[-+=&amp;|*/~%^&lt;&gt;~] \s*+ (if|unless)
-	         )
-	        )\b
-	        (?! [^;]*+ ; .*? \bend\b )
-	    |(  "(\\.|[^"])*+"              # eat a double quoted string
-	     | '(\\.|[^'])*+'            # eat a single quoted string
-	     |   [^#"']                    # eat all but comments and strings
-	     )*
-	     ( \{ (?!  [^}]*+ \} )
-	     | \[ (?! [^\]]*+ \] )
-	     )
-	    ).*$
-	|   [#] .*? \(fold\) \s*+ $         # Sune’s special marker
-	</string>
-	<key>foldingStopMarker</key>
-	<string>(?x)
-		(   (^|;) \s*+ end   \s*+ ([#].*)? $
-		|   (^|;) \s*+ end \. .* $
-		|   ^     \s*+ [}\]] ,? \s*+ ([#].*)? $
-		|   [#] .*? \(end\) \s*+ $    # Sune’s special marker
-		|   ^=end
-		)</string>
-	<key>keyEquivalent</key>
-	<string>^~R</string>
-	<key>name</key>
-	<string>Ruby</string>
-	<key>patterns</key>
-	<array>
-		<dict>
-			<key>captures</key>
-			<dict>
-				<key>1</key>
-				<dict>
-					<key>name</key>
-					<string>keyword.control.class.ruby</string>
-				</dict>
-				<key>2</key>
-				<dict>
-					<key>name</key>
-					<string>entity.name.type.class.ruby</string>
-				</dict>
-				<key>4</key>
-				<dict>
-					<key>name</key>
-					<string>entity.other.inherited-class.ruby</string>
-				</dict>
-				<key>5</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.separator.inheritance.ruby</string>
-				</dict>
-				<key>6</key>
-				<dict>
-					<key>name</key>
-					<string>variable.other.object.ruby</string>
-				</dict>
-				<key>7</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.variable.ruby</string>
-				</dict>
-			</dict>
-			<key>match</key>
-			<string>^\s*(class)\s+(([.a-zA-Z0-9_:]+(\s*(&lt;)\s*[.a-zA-Z0-9_:]+)?)|((&lt;&lt;)\s*[.a-zA-Z0-9_:]+))</string>
-			<key>name</key>
-			<string>meta.class.ruby</string>
-		</dict>
-		<dict>
-			<key>captures</key>
-			<dict>
-				<key>1</key>
-				<dict>
-					<key>name</key>
-					<string>keyword.control.module.ruby</string>
-				</dict>
-				<key>2</key>
-				<dict>
-					<key>name</key>
-					<string>entity.name.type.module.ruby</string>
-				</dict>
-				<key>3</key>
-				<dict>
-					<key>name</key>
-					<string>entity.other.inherited-class.module.first.ruby</string>
-				</dict>
-				<key>4</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.separator.inheritance.ruby</string>
-				</dict>
-				<key>5</key>
-				<dict>
-					<key>name</key>
-					<string>entity.other.inherited-class.module.second.ruby</string>
-				</dict>
-				<key>6</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.separator.inheritance.ruby</string>
-				</dict>
-				<key>7</key>
-				<dict>
-					<key>name</key>
-					<string>entity.other.inherited-class.module.third.ruby</string>
-				</dict>
-				<key>8</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.separator.inheritance.ruby</string>
-				</dict>
-			</dict>
-			<key>match</key>
-			<string>^\s*(module)\s+(([A-Z]\w*(::))?([A-Z]\w*(::))?([A-Z]\w*(::))*[A-Z]\w*)</string>
-			<key>name</key>
-			<string>meta.module.ruby</string>
-		</dict>
-		<dict>
-			<key>comment</key>
-			<string>else if is a common mistake carried over from other languages. it works if you put in a second end, but it’s never what you want.</string>
-			<key>match</key>
-			<string>(?&lt;!\.)\belse(\s)+if\b</string>
-			<key>name</key>
-			<string>invalid.deprecated.ruby</string>
-		</dict>
-		<dict>
-			<key>comment</key>
-			<string>everything being a reserved word, not a value and needing a 'end' is a..</string>
-			<key>match</key>
-			<string>(?&lt;!\.)\b(BEGIN|begin|case|class|else|elsif|END|end|ensure|for|if|in|module|rescue|then|unless|until|when|while)\b(?![?!])</string>
-			<key>name</key>
-			<string>keyword.control.ruby</string>
-		</dict>
-		<dict>
-			<key>comment</key>
-			<string>contextual smart pair support for block parameters</string>
-			<key>match</key>
-			<string>(?&lt;!\.)\bdo\b\s*</string>
-			<key>name</key>
-			<string>keyword.control.start-block.ruby</string>
-		</dict>
-		<dict>
-			<key>comment</key>
-			<string>contextual smart pair support</string>
-			<key>match</key>
-			<string>(?&lt;=\{)(\s+)</string>
-			<key>name</key>
-			<string>meta.syntax.ruby.start-block</string>
-		</dict>
-		<dict>
-			<key>comment</key>
-			<string> as above, just doesn't need a 'end' and does a logic operation</string>
-			<key>match</key>
-			<string>(?&lt;!\.)\b(and|not|or)\b</string>
-			<key>name</key>
-			<string>keyword.operator.logical.ruby</string>
-		</dict>
-		<dict>
-			<key>comment</key>
-			<string> just as above but being not a logical operation</string>
-			<key>match</key>
-			<string>(?&lt;!\.)\b(alias|alias_method|break|next|redo|retry|return|super|undef|yield)\b(?![?!])|\bdefined\?|\bblock_given\?</string>
-			<key>name</key>
-			<string>keyword.control.pseudo-method.ruby</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>\b(nil|true|false)\b(?![?!])</string>
-			<key>name</key>
-			<string>constant.language.ruby</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>\b(__(FILE|LINE)__|self)\b(?![?!])</string>
-			<key>name</key>
-			<string>variable.language.ruby</string>
-		</dict>
-		<dict>
-			<key>comment</key>
-			<string> everything being a method but having a special function is a..</string>
-			<key>match</key>
-			<string>\b(initialize|new|loop|include|extend|raise|attr_reader|attr_writer|attr_accessor|attr|catch|throw|private|module_function|public|protected)\b(?![?!])</string>
-			<key>name</key>
-			<string>keyword.other.special-method.ruby</string>
-		</dict>
-		<dict>
-			<key>begin</key>
-			<string>\b(require|gem)\b</string>
-			<key>captures</key>
-			<dict>
-				<key>1</key>
-				<dict>
-					<key>name</key>
-					<string>keyword.other.special-method.ruby</string>
-				</dict>
-			</dict>
-			<key>end</key>
-			<string>$|(?=#)</string>
-			<key>name</key>
-			<string>meta.require.ruby</string>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>include</key>
-					<string>$self</string>
-				</dict>
-			</array>
-		</dict>
-		<dict>
-			<key>captures</key>
-			<dict>
-				<key>1</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.variable.ruby</string>
-				</dict>
-			</dict>
-			<key>match</key>
-			<string>(@)[a-zA-Z_]\w*</string>
-			<key>name</key>
-			<string>variable.other.readwrite.instance.ruby</string>
-		</dict>
-		<dict>
-			<key>captures</key>
-			<dict>
-				<key>1</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.variable.ruby</string>
-				</dict>
-			</dict>
-			<key>match</key>
-			<string>(@@)[a-zA-Z_]\w*</string>
-			<key>name</key>
-			<string>variable.other.readwrite.class.ruby</string>
-		</dict>
-		<dict>
-			<key>captures</key>
-			<dict>
-				<key>1</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.variable.ruby</string>
-				</dict>
-			</dict>
-			<key>match</key>
-			<string>(\$)[a-zA-Z_]\w*</string>
-			<key>name</key>
-			<string>variable.other.readwrite.global.ruby</string>
-		</dict>
-		<dict>
-			<key>captures</key>
-			<dict>
-				<key>1</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.variable.ruby</string>
-				</dict>
-			</dict>
-			<key>match</key>
-			<string>(\$)(!|@|&amp;|`|'|\+|\d+|~|=|/|\\|,|;|\.|&lt;|&gt;|_|\*|\$|\?|:|"|-[0adFiIlpv])</string>
-			<key>name</key>
-			<string>variable.other.readwrite.global.pre-defined.ruby</string>
-		</dict>
-		<dict>
-			<key>begin</key>
-			<string>\b(ENV)\[</string>
-			<key>beginCaptures</key>
-			<dict>
-				<key>1</key>
-				<dict>
-					<key>name</key>
-					<string>variable.other.constant.ruby</string>
-				</dict>
-			</dict>
-			<key>end</key>
-			<string>\]</string>
-			<key>name</key>
-			<string>meta.environment-variable.ruby</string>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>include</key>
-					<string>$self</string>
-				</dict>
-			</array>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>\b[A-Z]\w*(?=((\.|::)[A-Za-z]|\[))</string>
-			<key>name</key>
-			<string>support.class.ruby</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>\b[A-Z]\w*\b</string>
-			<key>name</key>
-			<string>variable.other.constant.ruby</string>
-		</dict>
-		<dict>
-			<key>begin</key>
-			<string>(?x)
-			         (?=def\b)                                                      # an optimization to help Oniguruma fail fast
-			         (?&lt;=^|\s)(def)\s+                                              # the def keyword
-			         ( (?&gt;[a-zA-Z_]\w*(?&gt;\.|::))?                                   # a method name prefix
-			           (?&gt;[a-zA-Z_]\w*(?&gt;[?!]|=(?!&gt;))?                              # the method name
-			           |===?|&gt;[&gt;=]?|&lt;=&gt;|&lt;[&lt;=]?|[%&amp;`/\|]|\*\*?|=?~|[-+]@?|\[\]=?) )  # …or an operator method
-			         \s*(\()                                                        # the openning parenthesis for arguments
-			        </string>
-			<key>beginCaptures</key>
-			<dict>
-				<key>1</key>
-				<dict>
-					<key>name</key>
-					<string>keyword.control.def.ruby</string>
-				</dict>
-				<key>2</key>
-				<dict>
-					<key>name</key>
-					<string>entity.name.function.ruby</string>
-				</dict>
-				<key>3</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.parameters.ruby</string>
-				</dict>
-			</dict>
-			<key>comment</key>
-			<string>the method pattern comes from the symbol pattern, see there for a explaination</string>
-			<key>contentName</key>
-			<string>variable.parameter.function.ruby</string>
-			<key>end</key>
-			<string>\)</string>
-			<key>endCaptures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.parameters.ruby</string>
-				</dict>
-			</dict>
-			<key>name</key>
-			<string>meta.function.method.with-arguments.ruby</string>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>include</key>
-					<string>$self</string>
-				</dict>
-			</array>
-		</dict>
-		<dict>
-			<key>begin</key>
-			<string>(?x)
-			         (?=def\b)                                                      # an optimization to help Oniguruma fail fast
-			         (?&lt;=^|\s)(def)\s+                                              # the def keyword
-			         ( (?&gt;[a-zA-Z_]\w*(?&gt;\.|::))?                                   # a method name prefix
-			           (?&gt;[a-zA-Z_]\w*(?&gt;[?!]|=(?!&gt;))?                              # the method name
-			           |===?|&gt;[&gt;=]?|&lt;=&gt;|&lt;[&lt;=]?|[%&amp;`/\|]|\*\*?|=?~|[-+]@?|\[\]=?) )  # …or an operator method
-			         [ \t]                                                          # the space separating the arguments
-			         (?=[ \t]*[^\s#;])                                              # make sure arguments and not a comment follow
-			        </string>
-			<key>beginCaptures</key>
-			<dict>
-				<key>1</key>
-				<dict>
-					<key>name</key>
-					<string>keyword.control.def.ruby</string>
-				</dict>
-				<key>2</key>
-				<dict>
-					<key>name</key>
-					<string>entity.name.function.ruby</string>
-				</dict>
-			</dict>
-			<key>comment</key>
-			<string>same as the previous rule, but without parentheses around the arguments</string>
-			<key>contentName</key>
-			<string>variable.parameter.function.ruby</string>
-			<key>end</key>
-			<string>$</string>
-			<key>name</key>
-			<string>meta.function.method.with-arguments.ruby</string>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>include</key>
-					<string>$self</string>
-				</dict>
-			</array>
-		</dict>
-		<dict>
-			<key>captures</key>
-			<dict>
-				<key>1</key>
-				<dict>
-					<key>name</key>
-					<string>keyword.control.def.ruby</string>
-				</dict>
-				<key>3</key>
-				<dict>
-					<key>name</key>
-					<string>entity.name.function.ruby</string>
-				</dict>
-			</dict>
-			<key>comment</key>
-			<string> the optional name is just to catch the def also without a method-name</string>
-			<key>match</key>
-			<string>(?x)
-			         (?=def\b)                                                           # an optimization to help Oniguruma fail fast
-			         (?&lt;=^|\s)(def)\b                                                    # the def keyword
-			         ( \s+                                                               # an optional group of whitespace followed by…
-			           ( (?&gt;[a-zA-Z_]\w*(?&gt;\.|::))?                                      # a method name prefix
-			             (?&gt;[a-zA-Z_]\w*(?&gt;[?!]|=(?!&gt;))?                                 # the method name
-			             |===?|&gt;[&gt;=]?|&lt;=&gt;|&lt;[&lt;=]?|[%&amp;`/\|]|\*\*?|=?~|[-+]@?|\[\]=?) ) )?  # …or an operator method
-			        </string>
-			<key>name</key>
-			<string>meta.function.method.without-arguments.ruby</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>\b(0[xX]\h(?&gt;_?\h)*|\d(?&gt;_?\d)*(\.(?![^[:space:][:digit:]])(?&gt;_?\d)*)?([eE][-+]?\d(?&gt;_?\d)*)?|0[bB][01]+)\b</string>
-			<key>name</key>
-			<string>constant.numeric.ruby</string>
-		</dict>
-		<dict>
-			<key>begin</key>
-			<string>:'</string>
-			<key>captures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.constant.ruby</string>
-				</dict>
-			</dict>
-			<key>end</key>
-			<string>'</string>
-			<key>name</key>
-			<string>constant.other.symbol.single-quoted.ruby</string>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>match</key>
-					<string>\\['\\]</string>
-					<key>name</key>
-					<string>constant.character.escape.ruby</string>
-				</dict>
-			</array>
-		</dict>
-		<dict>
-			<key>begin</key>
-			<string>:"</string>
-			<key>captures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.constant.ruby</string>
-				</dict>
-			</dict>
-			<key>end</key>
-			<string>"</string>
-			<key>name</key>
-			<string>constant.other.symbol.double-quoted.ruby</string>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>include</key>
-					<string>#interpolated_ruby</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>#escaped_char</string>
-				</dict>
-			</array>
-		</dict>
-		<dict>
-			<key>comment</key>
-			<string>Needs higher precidence than regular expressions.</string>
-			<key>match</key>
-			<string>(?&lt;!\()/=</string>
-			<key>name</key>
-			<string>keyword.operator.assignment.augmented.ruby</string>
-		</dict>
-		<dict>
-			<key>begin</key>
-			<string>'</string>
-			<key>beginCaptures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.begin.ruby</string>
-				</dict>
-			</dict>
-			<key>comment</key>
-			<string>single quoted string (does not allow interpolation)</string>
-			<key>end</key>
-			<string>'</string>
-			<key>endCaptures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.end.ruby</string>
-				</dict>
-			</dict>
-			<key>name</key>
-			<string>string.quoted.single.ruby</string>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>match</key>
-					<string>\\'|\\\\</string>
-					<key>name</key>
-					<string>constant.character.escape.ruby</string>
-				</dict>
-			</array>
-		</dict>
-		<dict>
-			<key>begin</key>
-			<string>"</string>
-			<key>beginCaptures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.begin.ruby</string>
-				</dict>
-			</dict>
-			<key>comment</key>
-			<string>double quoted string (allows for interpolation)</string>
-			<key>end</key>
-			<string>"</string>
-			<key>endCaptures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.end.ruby</string>
-				</dict>
-			</dict>
-			<key>name</key>
-			<string>string.quoted.double.ruby</string>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>include</key>
-					<string>#interpolated_ruby</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>#escaped_char</string>
-				</dict>
-			</array>
-		</dict>
-		<dict>
-			<key>begin</key>
-			<string>`</string>
-			<key>beginCaptures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.begin.ruby</string>
-				</dict>
-			</dict>
-			<key>comment</key>
-			<string>execute string (allows for interpolation)</string>
-			<key>end</key>
-			<string>`</string>
-			<key>endCaptures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.end.ruby</string>
-				</dict>
-			</dict>
-			<key>name</key>
-			<string>string.interpolated.ruby</string>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>include</key>
-					<string>#interpolated_ruby</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>#escaped_char</string>
-				</dict>
-			</array>
-		</dict>
-		<dict>
-			<key>begin</key>
-			<string>%x\{</string>
-			<key>beginCaptures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.begin.ruby</string>
-				</dict>
-			</dict>
-			<key>comment</key>
-			<string>execute string (allow for interpolation)</string>
-			<key>end</key>
-			<string>\}</string>
-			<key>endCaptures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.end.ruby</string>
-				</dict>
-			</dict>
-			<key>name</key>
-			<string>string.interpolated.ruby</string>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>include</key>
-					<string>#interpolated_ruby</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>#escaped_char</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>#nest_curly_i</string>
-				</dict>
-			</array>
-		</dict>
-		<dict>
-			<key>begin</key>
-			<string>%x\[</string>
-			<key>beginCaptures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.begin.ruby</string>
-				</dict>
-			</dict>
-			<key>comment</key>
-			<string>execute string (allow for interpolation)</string>
-			<key>end</key>
-			<string>\]</string>
-			<key>endCaptures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.end.ruby</string>
-				</dict>
-			</dict>
-			<key>name</key>
-			<string>string.interpolated.ruby</string>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>include</key>
-					<string>#interpolated_ruby</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>#escaped_char</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>#nest_brackets_i</string>
-				</dict>
-			</array>
-		</dict>
-		<dict>
-			<key>begin</key>
-			<string>%x\&lt;</string>
-			<key>beginCaptures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.begin.ruby</string>
-				</dict>
-			</dict>
-			<key>comment</key>
-			<string>execute string (allow for interpolation)</string>
-			<key>end</key>
-			<string>\&gt;</string>
-			<key>endCaptures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.end.ruby</string>
-				</dict>
-			</dict>
-			<key>name</key>
-			<string>string.interpolated.ruby</string>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>include</key>
-					<string>#interpolated_ruby</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>#escaped_char</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>#nest_ltgt_i</string>
-				</dict>
-			</array>
-		</dict>
-		<dict>
-			<key>begin</key>
-			<string>%x\(</string>
-			<key>beginCaptures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.begin.ruby</string>
-				</dict>
-			</dict>
-			<key>comment</key>
-			<string>execute string (allow for interpolation)</string>
-			<key>end</key>
-			<string>\)</string>
-			<key>endCaptures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.end.ruby</string>
-				</dict>
-			</dict>
-			<key>name</key>
-			<string>string.interpolated.ruby</string>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>include</key>
-					<string>#interpolated_ruby</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>#escaped_char</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>#nest_parens_i</string>
-				</dict>
-			</array>
-		</dict>
-		<dict>
-			<key>begin</key>
-			<string>%x([^\w])</string>
-			<key>beginCaptures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.begin.ruby</string>
-				</dict>
-			</dict>
-			<key>comment</key>
-			<string>execute string (allow for interpolation)</string>
-			<key>end</key>
-			<string>\1</string>
-			<key>endCaptures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.end.ruby</string>
-				</dict>
-			</dict>
-			<key>name</key>
-			<string>string.interpolated.ruby</string>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>include</key>
-					<string>#interpolated_ruby</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>#escaped_char</string>
-				</dict>
-			</array>
-		</dict>
-		<dict>
-			<key>begin</key>
-			<string>(?x)
-			   (?:
-			     ^                      # beginning of line
-			   | (?&lt;=                   # or look-behind on:
-			       [=&gt;~(?:\[,|&amp;;]
-			     | [\s;]if\s			# keywords
-			     | [\s;]elsif\s
-			     | [\s;]while\s
-			     | [\s;]unless\s
-			     | [\s;]when\s
-			     | [\s;]assert_match\s
-			     | [\s;]or\s			# boolean opperators
-			     | [\s;]and\s
-			     | [\s;]not\s
-			     | [\s.]index\s			# methods
-			     | [\s.]scan\s
-			     | [\s.]sub\s
-			     | [\s.]sub!\s
-			     | [\s.]gsub\s
-			     | [\s.]gsub!\s
-			     | [\s.]match\s
-			     )
-			   | (?&lt;=                  # or a look-behind with line anchor:
-			        ^when\s            # duplication necessary due to limits of regex
-			      | ^if\s
-			      | ^elsif\s
-			      | ^while\s
-			      | ^unless\s
-			      )
-			   )
-			   \s*((/))(?![*+{}?])
-			</string>
-			<key>captures</key>
-			<dict>
-				<key>1</key>
-				<dict>
-					<key>name</key>
-					<string>string.regexp.classic.ruby</string>
-				</dict>
-				<key>2</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.ruby</string>
-				</dict>
-			</dict>
-			<key>comment</key>
-			<string>regular expressions (normal)
-			we only start a regexp if the character before it (excluding whitespace)
-			is what we think is before a regexp
-			</string>
-			<key>contentName</key>
-			<string>string.regexp.classic.ruby</string>
-			<key>end</key>
-			<string>((/[eimnosux]*))</string>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>include</key>
-					<string>#regex_sub</string>
-				</dict>
-			</array>
-		</dict>
-		<dict>
-			<key>begin</key>
-			<string>%r\{</string>
-			<key>beginCaptures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.begin.ruby</string>
-				</dict>
-			</dict>
-			<key>comment</key>
-			<string>regular expressions (literal)</string>
-			<key>end</key>
-			<string>\}[eimnosux]*</string>
-			<key>endCaptures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.end.ruby</string>
-				</dict>
-			</dict>
-			<key>name</key>
-			<string>string.regexp.mod-r.ruby</string>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>include</key>
-					<string>#regex_sub</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>#nest_curly_r</string>
-				</dict>
-			</array>
-		</dict>
-		<dict>
-			<key>begin</key>
-			<string>%r\[</string>
-			<key>beginCaptures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.begin.ruby</string>
-				</dict>
-			</dict>
-			<key>comment</key>
-			<string>regular expressions (literal)</string>
-			<key>end</key>
-			<string>\][eimnosux]*</string>
-			<key>endCaptures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.end.ruby</string>
-				</dict>
-			</dict>
-			<key>name</key>
-			<string>string.regexp.mod-r.ruby</string>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>include</key>
-					<string>#regex_sub</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>#nest_brackets_r</string>
-				</dict>
-			</array>
-		</dict>
-		<dict>
-			<key>begin</key>
-			<string>%r\(</string>
-			<key>beginCaptures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.begin.ruby</string>
-				</dict>
-			</dict>
-			<key>comment</key>
-			<string>regular expressions (literal)</string>
-			<key>end</key>
-			<string>\)[eimnosux]*</string>
-			<key>endCaptures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.end.ruby</string>
-				</dict>
-			</dict>
-			<key>name</key>
-			<string>string.regexp.mod-r.ruby</string>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>include</key>
-					<string>#regex_sub</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>#nest_parens_r</string>
-				</dict>
-			</array>
-		</dict>
-		<dict>
-			<key>begin</key>
-			<string>%r\&lt;</string>
-			<key>beginCaptures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.begin.ruby</string>
-				</dict>
-			</dict>
-			<key>comment</key>
-			<string>regular expressions (literal)</string>
-			<key>end</key>
-			<string>\&gt;[eimnosux]*</string>
-			<key>endCaptures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.end.ruby</string>
-				</dict>
-			</dict>
-			<key>name</key>
-			<string>string.regexp.mod-r.ruby</string>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>include</key>
-					<string>#regex_sub</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>#nest_ltgt_r</string>
-				</dict>
-			</array>
-		</dict>
-		<dict>
-			<key>begin</key>
-			<string>%r([^\w])</string>
-			<key>beginCaptures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.begin.ruby</string>
-				</dict>
-			</dict>
-			<key>comment</key>
-			<string>regular expressions (literal)</string>
-			<key>end</key>
-			<string>\1[eimnosux]*</string>
-			<key>endCaptures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.end.ruby</string>
-				</dict>
-			</dict>
-			<key>name</key>
-			<string>string.regexp.mod-r.ruby</string>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>include</key>
-					<string>#regex_sub</string>
-				</dict>
-			</array>
-		</dict>
-		<dict>
-			<key>begin</key>
-			<string>%[QWSR]?\(</string>
-			<key>beginCaptures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.begin.ruby</string>
-				</dict>
-			</dict>
-			<key>comment</key>
-			<string>literal capable of interpolation ()</string>
-			<key>end</key>
-			<string>\)</string>
-			<key>endCaptures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.end.ruby</string>
-				</dict>
-			</dict>
-			<key>name</key>
-			<string>string.quoted.other.literal.upper.ruby</string>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>include</key>
-					<string>#interpolated_ruby</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>#escaped_char</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>#nest_parens_i</string>
-				</dict>
-			</array>
-		</dict>
-		<dict>
-			<key>begin</key>
-			<string>%[QWSR]?\[</string>
-			<key>beginCaptures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.begin.ruby</string>
-				</dict>
-			</dict>
-			<key>comment</key>
-			<string>literal capable of interpolation []</string>
-			<key>end</key>
-			<string>\]</string>
-			<key>endCaptures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.end.ruby</string>
-				</dict>
-			</dict>
-			<key>name</key>
-			<string>string.quoted.other.literal.upper.ruby</string>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>include</key>
-					<string>#interpolated_ruby</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>#escaped_char</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>#nest_brackets_i</string>
-				</dict>
-			</array>
-		</dict>
-		<dict>
-			<key>begin</key>
-			<string>%[QWSR]?\&lt;</string>
-			<key>beginCaptures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.begin.ruby</string>
-				</dict>
-			</dict>
-			<key>comment</key>
-			<string>literal capable of interpolation &lt;&gt;</string>
-			<key>end</key>
-			<string>\&gt;</string>
-			<key>endCaptures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.end.ruby</string>
-				</dict>
-			</dict>
-			<key>name</key>
-			<string>string.quoted.other.literal.upper.ruby</string>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>include</key>
-					<string>#interpolated_ruby</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>#escaped_char</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>#nest_ltgt_i</string>
-				</dict>
-			</array>
-		</dict>
-		<dict>
-			<key>begin</key>
-			<string>%[QWSR]?\{</string>
-			<key>beginCaptures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.begin.ruby</string>
-				</dict>
-			</dict>
-			<key>comment</key>
-			<string>literal capable of interpolation -- {}</string>
-			<key>end</key>
-			<string>\}</string>
-			<key>endCaptures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.end.ruby</string>
-				</dict>
-			</dict>
-			<key>name</key>
-			<string>string.quoted.double.ruby.mod</string>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>include</key>
-					<string>#interpolated_ruby</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>#escaped_char</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>#nest_curly_i</string>
-				</dict>
-			</array>
-		</dict>
-		<dict>
-			<key>begin</key>
-			<string>%[QWSR]([^\w])</string>
-			<key>beginCaptures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.begin.ruby</string>
-				</dict>
-			</dict>
-			<key>comment</key>
-			<string>literal capable of interpolation -- wildcard</string>
-			<key>end</key>
-			<string>\1</string>
-			<key>endCaptures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.end.ruby</string>
-				</dict>
-			</dict>
-			<key>name</key>
-			<string>string.quoted.other.literal.upper.ruby</string>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>include</key>
-					<string>#interpolated_ruby</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>#escaped_char</string>
-				</dict>
-			</array>
-		</dict>
-		<dict>
-			<key>begin</key>
-			<string>%([^\w\s=])</string>
-			<key>beginCaptures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.begin.ruby</string>
-				</dict>
-			</dict>
-			<key>comment</key>
-			<string>literal capable of interpolation -- wildcard</string>
-			<key>end</key>
-			<string>\1</string>
-			<key>endCaptures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.end.ruby</string>
-				</dict>
-			</dict>
-			<key>name</key>
-			<string>string.quoted.other.literal.other.ruby</string>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>include</key>
-					<string>#interpolated_ruby</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>#escaped_char</string>
-				</dict>
-			</array>
-		</dict>
-		<dict>
-			<key>begin</key>
-			<string>%[qws]\(</string>
-			<key>beginCaptures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.begin.ruby</string>
-				</dict>
-			</dict>
-			<key>comment</key>
-			<string>literal incapable of interpolation -- ()</string>
-			<key>end</key>
-			<string>\)</string>
-			<key>endCaptures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.end.ruby</string>
-				</dict>
-			</dict>
-			<key>name</key>
-			<string>string.quoted.other.literal.lower.ruby</string>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>match</key>
-					<string>\\\)|\\\\</string>
-					<key>name</key>
-					<string>constant.character.escape.ruby</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>#nest_parens</string>
-				</dict>
-			</array>
-		</dict>
-		<dict>
-			<key>begin</key>
-			<string>%[qws]\&lt;</string>
-			<key>beginCaptures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.begin.ruby</string>
-				</dict>
-			</dict>
-			<key>comment</key>
-			<string>literal incapable of interpolation -- &lt;&gt;</string>
-			<key>end</key>
-			<string>\&gt;</string>
-			<key>endCaptures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.end.ruby</string>
-				</dict>
-			</dict>
-			<key>name</key>
-			<string>string.quoted.other.literal.lower.ruby</string>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>match</key>
-					<string>\\\&gt;|\\\\</string>
-					<key>name</key>
-					<string>constant.character.escape.ruby</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>#nest_ltgt</string>
-				</dict>
-			</array>
-		</dict>
-		<dict>
-			<key>begin</key>
-			<string>%[qws]\[</string>
-			<key>beginCaptures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.begin.ruby</string>
-				</dict>
-			</dict>
-			<key>comment</key>
-			<string>literal incapable of interpolation -- []</string>
-			<key>end</key>
-			<string>\]</string>
-			<key>endCaptures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.end.ruby</string>
-				</dict>
-			</dict>
-			<key>name</key>
-			<string>string.quoted.other.literal.lower.ruby</string>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>match</key>
-					<string>\\\]|\\\\</string>
-					<key>name</key>
-					<string>constant.character.escape.ruby</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>#nest_brackets</string>
-				</dict>
-			</array>
-		</dict>
-		<dict>
-			<key>begin</key>
-			<string>%[qws]\{</string>
-			<key>beginCaptures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.begin.ruby</string>
-				</dict>
-			</dict>
-			<key>comment</key>
-			<string>literal incapable of interpolation -- {}</string>
-			<key>end</key>
-			<string>\}</string>
-			<key>endCaptures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.end.ruby</string>
-				</dict>
-			</dict>
-			<key>name</key>
-			<string>string.quoted.other.literal.lower.ruby</string>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>match</key>
-					<string>\\\}|\\\\</string>
-					<key>name</key>
-					<string>constant.character.escape.ruby</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>#nest_curly</string>
-				</dict>
-			</array>
-		</dict>
-		<dict>
-			<key>begin</key>
-			<string>%[qws]([^\w])</string>
-			<key>beginCaptures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.begin.ruby</string>
-				</dict>
-			</dict>
-			<key>comment</key>
-			<string>literal incapable of interpolation -- wildcard</string>
-			<key>end</key>
-			<string>\1</string>
-			<key>endCaptures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.end.ruby</string>
-				</dict>
-			</dict>
-			<key>name</key>
-			<string>string.quoted.other.literal.lower.ruby</string>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>comment</key>
-					<string>Cant be named because its not neccesarily an escape.</string>
-					<key>match</key>
-					<string>\\.</string>
-				</dict>
-			</array>
-		</dict>
-		<dict>
-			<key>captures</key>
-			<dict>
-				<key>1</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.constant.ruby</string>
-				</dict>
-			</dict>
-			<key>comment</key>
-			<string>symbols</string>
-			<key>match</key>
-			<string>(?&lt;!:)(:)(?&gt;[a-zA-Z_]\w*(?&gt;[?!]|=(?![&gt;=]))?|===?|&gt;[&gt;=]?|&lt;[&lt;=]?|&lt;=&gt;|[%&amp;`/\|]|\*\*?|=?~|[-+]@?|\[\]=?|@@?[a-zA-Z_]\w*)</string>
-			<key>name</key>
-			<string>constant.other.symbol.ruby</string>
-		</dict>
-		<dict>
-			<key>captures</key>
-			<dict>
-				<key>1</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.constant.ruby</string>
-				</dict>
-			</dict>
-			<key>comment</key>
-			<string>symbols</string>
-			<key>match</key>
-			<string>(?&gt;[a-zA-Z_]\w*(?&gt;[?!])?)(:)(?!:)</string>
-			<key>name</key>
-			<string>constant.other.symbol.ruby.19syntax</string>
-		</dict>
-		<dict>
-			<key>begin</key>
-			<string>^=begin</string>
-			<key>captures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.comment.ruby</string>
-				</dict>
-			</dict>
-			<key>comment</key>
-			<string>multiline comments</string>
-			<key>end</key>
-			<string>^=end</string>
-			<key>name</key>
-			<string>comment.block.documentation.ruby</string>
-		</dict>
-		<dict>
-			<key>captures</key>
-			<dict>
-				<key>1</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.comment.ruby</string>
-				</dict>
-			</dict>
-			<key>match</key>
-			<string>(?:^[ \t]+)?(#).*$\n?</string>
-			<key>name</key>
-			<string>comment.line.number-sign.ruby</string>
-		</dict>
-		<dict>
-			<key>comment</key>
-			<string>
-			matches questionmark-letters.
-
-			examples (1st alternation = hex):
-			?\x1     ?\x61
-
-			examples (2nd alternation = octal):
-			?\0      ?\07     ?\017
-
-			examples (3rd alternation = escaped):
-			?\n      ?\b
-
-			examples (4th alternation = meta-ctrl):
-			?\C-a    ?\M-a    ?\C-\M-\C-\M-a
-
-			examples (4th alternation = normal):
-			?a       ?A       ?0 
-			?*       ?"       ?( 
-			?.       ?#
-			
-			
-			the negative lookbehind prevents against matching
-			p(42.tainted?)
-			</string>
-			<key>match</key>
-			<string>(?&lt;!\w)\?(\\(x\h{1,2}(?!\h)\b|0[0-7]{0,2}(?![0-7])\b|[^x0MC])|(\\[MC]-)+\w|[^\s\\])</string>
-			<key>name</key>
-			<string>constant.numeric.ruby</string>
-		</dict>
-		<dict>
-			<key>begin</key>
-			<string>^__END__\n</string>
-			<key>captures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>string.unquoted.program-block.ruby</string>
-				</dict>
-			</dict>
-			<key>comment</key>
-			<string>__END__ marker</string>
-			<key>contentName</key>
-			<string>text.plain</string>
-			<key>end</key>
-			<string>(?=not)impossible</string>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>begin</key>
-					<string>(?=&lt;?xml|&lt;(?i:html\b)|!DOCTYPE (?i:html\b))</string>
-					<key>end</key>
-					<string>(?=not)impossible</string>
-					<key>name</key>
-					<string>text.html.embedded.ruby</string>
-					<key>patterns</key>
-					<array>
-						<dict>
-							<key>include</key>
-							<string>text.html.basic</string>
-						</dict>
-					</array>
-				</dict>
-			</array>
-		</dict>
-		<dict>
-			<key>begin</key>
-			<string>(?&gt;&lt;&lt;-("?)((?:[_\w]+_|)HTML)\b\1)</string>
-			<key>beginCaptures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.begin.ruby</string>
-				</dict>
-			</dict>
-			<key>comment</key>
-			<string>heredoc with embedded HTML and indented terminator</string>
-			<key>contentName</key>
-			<string>text.html.embedded.ruby</string>
-			<key>end</key>
-			<string>\s*\2$</string>
-			<key>endCaptures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.end.ruby</string>
-				</dict>
-			</dict>
-			<key>name</key>
-			<string>string.unquoted.embedded.html.ruby</string>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>include</key>
-					<string>#heredoc</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>text.html.basic</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>#interpolated_ruby</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>#escaped_char</string>
-				</dict>
-			</array>
-		</dict>
-		<dict>
-			<key>begin</key>
-			<string>(?&gt;&lt;&lt;-("?)((?:[_\w]+_|)SQL)\b\1)</string>
-			<key>beginCaptures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.begin.ruby</string>
-				</dict>
-			</dict>
-			<key>comment</key>
-			<string>heredoc with embedded SQL and indented terminator</string>
-			<key>contentName</key>
-			<string>text.sql.embedded.ruby</string>
-			<key>end</key>
-			<string>\s*\2$</string>
-			<key>endCaptures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.end.ruby</string>
-				</dict>
-			</dict>
-			<key>name</key>
-			<string>string.unquoted.embedded.sql.ruby</string>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>include</key>
-					<string>#heredoc</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>source.sql</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>#interpolated_ruby</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>#escaped_char</string>
-				</dict>
-			</array>
-		</dict>
-		<dict>
-			<key>begin</key>
-			<string>(?&gt;&lt;&lt;-("?)((?:[_\w]+_|)CSS)\b\1)</string>
-			<key>beginCaptures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.begin.ruby</string>
-				</dict>
-			</dict>
-			<key>comment</key>
-			<string>heredoc with embedded css and intented terminator</string>
-			<key>contentName</key>
-			<string>text.css.embedded.ruby</string>
-			<key>end</key>
-			<string>\s*\2$</string>
-			<key>endCaptures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.end.ruby</string>
-				</dict>
-			</dict>
-			<key>name</key>
-			<string>string.unquoted.embedded.css.ruby</string>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>include</key>
-					<string>#heredoc</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>source.css</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>#interpolated_ruby</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>#escaped_char</string>
-				</dict>
-			</array>
-		</dict>
-		<dict>
-			<key>begin</key>
-			<string>(?&gt;&lt;&lt;-("?)((?:[_\w]+_|)CPP)\b\1)</string>
-			<key>beginCaptures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.begin.ruby</string>
-				</dict>
-			</dict>
-			<key>comment</key>
-			<string>heredoc with embedded c++ and intented terminator</string>
-			<key>contentName</key>
-			<string>text.c++.embedded.ruby</string>
-			<key>end</key>
-			<string>\s*\2$</string>
-			<key>endCaptures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.end.ruby</string>
-				</dict>
-			</dict>
-			<key>name</key>
-			<string>string.unquoted.embedded.cplusplus.ruby</string>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>include</key>
-					<string>#heredoc</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>source.c++</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>#interpolated_ruby</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>#escaped_char</string>
-				</dict>
-			</array>
-		</dict>
-		<dict>
-			<key>begin</key>
-			<string>(?&gt;&lt;&lt;-("?)((?:[_\w]+_|)C)\b\1)</string>
-			<key>beginCaptures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.begin.ruby</string>
-				</dict>
-			</dict>
-			<key>comment</key>
-			<string>heredoc with embedded c++ and intented terminator</string>
-			<key>contentName</key>
-			<string>text.c.embedded.ruby</string>
-			<key>end</key>
-			<string>\s*\2$</string>
-			<key>endCaptures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.end.ruby</string>
-				</dict>
-			</dict>
-			<key>name</key>
-			<string>string.unquoted.embedded.c.ruby</string>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>include</key>
-					<string>#heredoc</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>source.c</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>#interpolated_ruby</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>#escaped_char</string>
-				</dict>
-			</array>
-		</dict>
-		<dict>
-			<key>begin</key>
-			<string>(?&gt;&lt;&lt;-("?)((?:[_\w]+_|)(?:JS|JAVASCRIPT))\b\1)</string>
-			<key>beginCaptures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.begin.ruby</string>
-				</dict>
-			</dict>
-			<key>comment</key>
-			<string>heredoc with embedded javascript and intented terminator</string>
-			<key>contentName</key>
-			<string>text.js.embedded.ruby</string>
-			<key>end</key>
-			<string>\s*\2$</string>
-			<key>endCaptures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.end.ruby</string>
-				</dict>
-			</dict>
-			<key>name</key>
-			<string>string.unquoted.embedded.js.ruby</string>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>include</key>
-					<string>#heredoc</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>source.js</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>#interpolated_ruby</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>#escaped_char</string>
-				</dict>
-			</array>
-		</dict>
-		<dict>
-			<key>begin</key>
-			<string>(?&gt;&lt;&lt;-("?)((?:[_\w]+_|)JQUERY)\b\1)</string>
-			<key>beginCaptures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.begin.ruby</string>
-				</dict>
-			</dict>
-			<key>comment</key>
-			<string>heredoc with embedded javascript and intented terminator</string>
-			<key>contentName</key>
-			<string>text.js.jquery.embedded.ruby</string>
-			<key>end</key>
-			<string>\s*\2$</string>
-			<key>endCaptures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.end.ruby</string>
-				</dict>
-			</dict>
-			<key>name</key>
-			<string>string.unquoted.embedded.js.jquery.ruby</string>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>include</key>
-					<string>#heredoc</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>source.js.jquery</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>#interpolated_ruby</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>#escaped_char</string>
-				</dict>
-			</array>
-		</dict>
-		<dict>
-			<key>begin</key>
-			<string>(?&gt;&lt;&lt;-("?)((?:[_\w]+_|)(?:SH|SHELL))\b\1)</string>
-			<key>beginCaptures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.begin.ruby</string>
-				</dict>
-			</dict>
-			<key>comment</key>
-			<string>heredoc with embedded shell and intented terminator</string>
-			<key>contentName</key>
-			<string>text.shell.embedded.ruby</string>
-			<key>end</key>
-			<string>\s*\2$</string>
-			<key>endCaptures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.end.ruby</string>
-				</dict>
-			</dict>
-			<key>name</key>
-			<string>string.unquoted.embedded.shell.ruby</string>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>include</key>
-					<string>#heredoc</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>source.shell</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>#interpolated_ruby</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>#escaped_char</string>
-				</dict>
-			</array>
-		</dict>
-		<dict>
-			<key>begin</key>
-			<string>(?&gt;&lt;&lt;-("?)((?:[_\w]+_|)RUBY)\b\1)</string>
-			<key>beginCaptures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.begin.ruby</string>
-				</dict>
-			</dict>
-			<key>comment</key>
-			<string>heredoc with embedded ruby and intented terminator</string>
-			<key>contentName</key>
-			<string>text.ruby.embedded.ruby</string>
-			<key>end</key>
-			<string>\s*\2$</string>
-			<key>endCaptures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.end.ruby</string>
-				</dict>
-			</dict>
-			<key>name</key>
-			<string>string.unquoted.embedded.ruby.ruby</string>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>include</key>
-					<string>#heredoc</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>source.ruby</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>#interpolated_ruby</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>#escaped_char</string>
-				</dict>
-			</array>
-		</dict>
-		<dict>
-			<key>begin</key>
-			<string>(?&gt;\=\s*&lt;&lt;(\w+))</string>
-			<key>beginCaptures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.begin.ruby</string>
-				</dict>
-			</dict>
-			<key>end</key>
-			<string>^\1$</string>
-			<key>endCaptures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.end.ruby</string>
-				</dict>
-			</dict>
-			<key>name</key>
-			<string>string.unquoted.heredoc.ruby</string>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>include</key>
-					<string>#heredoc</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>#interpolated_ruby</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>#escaped_char</string>
-				</dict>
-			</array>
-		</dict>
-		<dict>
-			<key>begin</key>
-			<string>(?&gt;&lt;&lt;-(\w+))</string>
-			<key>beginCaptures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.begin.ruby</string>
-				</dict>
-			</dict>
-			<key>comment</key>
-			<string>heredoc with indented terminator</string>
-			<key>end</key>
-			<string>\s*\1$</string>
-			<key>endCaptures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.end.ruby</string>
-				</dict>
-			</dict>
-			<key>name</key>
-			<string>string.unquoted.heredoc.ruby</string>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>include</key>
-					<string>#heredoc</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>#interpolated_ruby</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>#escaped_char</string>
-				</dict>
-			</array>
-		</dict>
-		<dict>
-			<key>begin</key>
-			<string>(?&lt;=\{|do|\{\s|do\s)(\|)</string>
-			<key>captures</key>
-			<dict>
-				<key>1</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.separator.variable.ruby</string>
-				</dict>
-			</dict>
-			<key>end</key>
-			<string>(\|)</string>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>match</key>
-					<string>[_a-zA-Z][_a-zA-Z0-9]*</string>
-					<key>name</key>
-					<string>variable.other.block.ruby</string>
-				</dict>
-				<dict>
-					<key>match</key>
-					<string>,</string>
-					<key>name</key>
-					<string>punctuation.separator.variable.ruby</string>
-				</dict>
-			</array>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>=&gt;</string>
-			<key>name</key>
-			<string>punctuation.separator.key-value</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>&lt;&lt;=|%=|&amp;=|\*=|\*\*=|\+=|\-=|\^=|\|{1,2}=|&lt;&lt;</string>
-			<key>name</key>
-			<string>keyword.operator.assignment.augmented.ruby</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>&lt;=&gt;|&lt;(?!&lt;|=)|&gt;(?!&lt;|=|&gt;)|&lt;=|&gt;=|===|==|=~|!=|!~|(?&lt;=[ \t])\?</string>
-			<key>name</key>
-			<string>keyword.operator.comparison.ruby</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>(?&lt;=[ \t])!+|\bnot\b|&amp;&amp;|\band\b|\|\||\bor\b|\^</string>
-			<key>name</key>
-			<string>keyword.operator.logical.ruby</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>(%|&amp;|\*\*|\*|\+|\-|/)</string>
-			<key>name</key>
-			<string>keyword.operator.arithmetic.ruby</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>=</string>
-			<key>name</key>
-			<string>keyword.operator.assignment.ruby</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>\||~|&gt;&gt;</string>
-			<key>name</key>
-			<string>keyword.operator.other.ruby</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>:</string>
-			<key>name</key>
-			<string>punctuation.separator.other.ruby</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>\;</string>
-			<key>name</key>
-			<string>punctuation.separator.statement.ruby</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>,</string>
-			<key>name</key>
-			<string>punctuation.separator.object.ruby</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>\.|::</string>
-			<key>name</key>
-			<string>punctuation.separator.method.ruby</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>\{|\}</string>
-			<key>name</key>
-			<string>punctuation.section.scope.ruby</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>\[|\]</string>
-			<key>name</key>
-			<string>punctuation.section.array.ruby</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>\(|\)</string>
-			<key>name</key>
-			<string>punctuation.section.function.ruby</string>
-		</dict>
-	</array>
-	<key>repository</key>
-	<dict>
-		<key>escaped_char</key>
-		<dict>
-			<key>match</key>
-			<string>\\(?:[0-7]{1,3}|x[\da-fA-F]{1,2}|.)</string>
-			<key>name</key>
-			<string>constant.character.escape.ruby</string>
-		</dict>
-		<key>heredoc</key>
-		<dict>
-			<key>begin</key>
-			<string>^&lt;&lt;-?\w+</string>
-			<key>end</key>
-			<string>$</string>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>include</key>
-					<string>$self</string>
-				</dict>
-			</array>
-		</dict>
-		<key>interpolated_ruby</key>
-		<dict>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>captures</key>
-					<dict>
-						<key>0</key>
-						<dict>
-							<key>name</key>
-							<string>punctuation.section.embedded.ruby</string>
-						</dict>
-						<key>1</key>
-						<dict>
-							<key>name</key>
-							<string>source.ruby.embedded.source.empty</string>
-						</dict>
-					</dict>
-					<key>match</key>
-					<string>#\{(\})</string>
-					<key>name</key>
-					<string>source.ruby.embedded.source</string>
-				</dict>
-				<dict>
-					<key>begin</key>
-					<string>#\{</string>
-					<key>captures</key>
-					<dict>
-						<key>0</key>
-						<dict>
-							<key>name</key>
-							<string>punctuation.section.embedded.ruby</string>
-						</dict>
-					</dict>
-					<key>end</key>
-					<string>\}</string>
-					<key>name</key>
-					<string>source.ruby.embedded.source</string>
-					<key>patterns</key>
-					<array>
-						<dict>
-							<key>include</key>
-							<string>#nest_curly_and_self</string>
-						</dict>
-						<dict>
-							<key>include</key>
-							<string>$self</string>
-						</dict>
-					</array>
-				</dict>
-				<dict>
-					<key>captures</key>
-					<dict>
-						<key>1</key>
-						<dict>
-							<key>name</key>
-							<string>punctuation.definition.variable.ruby</string>
-						</dict>
-					</dict>
-					<key>match</key>
-					<string>(#@)[a-zA-Z_]\w*</string>
-					<key>name</key>
-					<string>variable.other.readwrite.instance.ruby</string>
-				</dict>
-				<dict>
-					<key>captures</key>
-					<dict>
-						<key>1</key>
-						<dict>
-							<key>name</key>
-							<string>punctuation.definition.variable.ruby</string>
-						</dict>
-					</dict>
-					<key>match</key>
-					<string>(#@@)[a-zA-Z_]\w*</string>
-					<key>name</key>
-					<string>variable.other.readwrite.class.ruby</string>
-				</dict>
-				<dict>
-					<key>captures</key>
-					<dict>
-						<key>1</key>
-						<dict>
-							<key>name</key>
-							<string>punctuation.definition.variable.ruby</string>
-						</dict>
-					</dict>
-					<key>match</key>
-					<string>(#\$)[a-zA-Z_]\w*</string>
-					<key>name</key>
-					<string>variable.other.readwrite.global.ruby</string>
-				</dict>
-			</array>
-		</dict>
-		<key>nest_brackets</key>
-		<dict>
-			<key>begin</key>
-			<string>\[</string>
-			<key>captures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.section.scope.ruby</string>
-				</dict>
-			</dict>
-			<key>end</key>
-			<string>\]</string>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>include</key>
-					<string>#nest_brackets</string>
-				</dict>
-			</array>
-		</dict>
-		<key>nest_brackets_i</key>
-		<dict>
-			<key>begin</key>
-			<string>\[</string>
-			<key>captures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.section.scope.ruby</string>
-				</dict>
-			</dict>
-			<key>end</key>
-			<string>\]</string>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>include</key>
-					<string>#interpolated_ruby</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>#escaped_char</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>#nest_brackets_i</string>
-				</dict>
-			</array>
-		</dict>
-		<key>nest_brackets_r</key>
-		<dict>
-			<key>begin</key>
-			<string>\[</string>
-			<key>captures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.section.scope.ruby</string>
-				</dict>
-			</dict>
-			<key>end</key>
-			<string>\]</string>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>include</key>
-					<string>#regex_sub</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>#nest_brackets_r</string>
-				</dict>
-			</array>
-		</dict>
-		<key>nest_curly</key>
-		<dict>
-			<key>begin</key>
-			<string>\{</string>
-			<key>captures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.section.scope.ruby</string>
-				</dict>
-			</dict>
-			<key>end</key>
-			<string>\}</string>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>include</key>
-					<string>#nest_curly</string>
-				</dict>
-			</array>
-		</dict>
-		<key>nest_curly_and_self</key>
-		<dict>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>begin</key>
-					<string>\{</string>
-					<key>captures</key>
-					<dict>
-						<key>0</key>
-						<dict>
-							<key>name</key>
-							<string>punctuation.section.scope.ruby</string>
-						</dict>
-					</dict>
-					<key>end</key>
-					<string>\}</string>
-					<key>patterns</key>
-					<array>
-						<dict>
-							<key>include</key>
-							<string>#nest_curly_and_self</string>
-						</dict>
-					</array>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>$self</string>
-				</dict>
-			</array>
-		</dict>
-		<key>nest_curly_i</key>
-		<dict>
-			<key>begin</key>
-			<string>\{</string>
-			<key>captures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.section.scope.ruby</string>
-				</dict>
-			</dict>
-			<key>end</key>
-			<string>\}</string>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>include</key>
-					<string>#interpolated_ruby</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>#escaped_char</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>#nest_curly_i</string>
-				</dict>
-			</array>
-		</dict>
-		<key>nest_curly_r</key>
-		<dict>
-			<key>begin</key>
-			<string>\{</string>
-			<key>captures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.section.scope.ruby</string>
-				</dict>
-			</dict>
-			<key>end</key>
-			<string>\}</string>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>include</key>
-					<string>#regex_sub</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>#nest_curly_r</string>
-				</dict>
-			</array>
-		</dict>
-		<key>nest_ltgt</key>
-		<dict>
-			<key>begin</key>
-			<string>\&lt;</string>
-			<key>captures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.section.scope.ruby</string>
-				</dict>
-			</dict>
-			<key>end</key>
-			<string>\&gt;</string>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>include</key>
-					<string>#nest_ltgt</string>
-				</dict>
-			</array>
-		</dict>
-		<key>nest_ltgt_i</key>
-		<dict>
-			<key>begin</key>
-			<string>\&lt;</string>
-			<key>captures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.section.scope.ruby</string>
-				</dict>
-			</dict>
-			<key>end</key>
-			<string>\&gt;</string>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>include</key>
-					<string>#interpolated_ruby</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>#escaped_char</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>#nest_ltgt_i</string>
-				</dict>
-			</array>
-		</dict>
-		<key>nest_ltgt_r</key>
-		<dict>
-			<key>begin</key>
-			<string>\&lt;</string>
-			<key>captures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.section.scope.ruby</string>
-				</dict>
-			</dict>
-			<key>end</key>
-			<string>\&gt;</string>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>include</key>
-					<string>#regex_sub</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>#nest_ltgt_r</string>
-				</dict>
-			</array>
-		</dict>
-		<key>nest_parens</key>
-		<dict>
-			<key>begin</key>
-			<string>\(</string>
-			<key>captures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.section.scope.ruby</string>
-				</dict>
-			</dict>
-			<key>end</key>
-			<string>\)</string>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>include</key>
-					<string>#nest_parens</string>
-				</dict>
-			</array>
-		</dict>
-		<key>nest_parens_i</key>
-		<dict>
-			<key>begin</key>
-			<string>\(</string>
-			<key>captures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.section.scope.ruby</string>
-				</dict>
-			</dict>
-			<key>end</key>
-			<string>\)</string>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>include</key>
-					<string>#interpolated_ruby</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>#escaped_char</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>#nest_parens_i</string>
-				</dict>
-			</array>
-		</dict>
-		<key>nest_parens_r</key>
-		<dict>
-			<key>begin</key>
-			<string>\(</string>
-			<key>captures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.section.scope.ruby</string>
-				</dict>
-			</dict>
-			<key>end</key>
-			<string>\)</string>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>include</key>
-					<string>#regex_sub</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>#nest_parens_r</string>
-				</dict>
-			</array>
-		</dict>
-		<key>regex_sub</key>
-		<dict>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>include</key>
-					<string>#interpolated_ruby</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>#escaped_char</string>
-				</dict>
-				<dict>
-					<key>captures</key>
-					<dict>
-						<key>1</key>
-						<dict>
-							<key>name</key>
-							<string>punctuation.definition.arbitrary-repitition.ruby</string>
-						</dict>
-						<key>3</key>
-						<dict>
-							<key>name</key>
-							<string>punctuation.definition.arbitrary-repitition.ruby</string>
-						</dict>
-					</dict>
-					<key>match</key>
-					<string>(\{)\d+(,\d+)?(\})</string>
-					<key>name</key>
-					<string>string.regexp.arbitrary-repitition.ruby</string>
-				</dict>
-				<dict>
-					<key>begin</key>
-					<string>\[(?:\^?\])?</string>
-					<key>captures</key>
-					<dict>
-						<key>0</key>
-						<dict>
-							<key>name</key>
-							<string>punctuation.definition.character-class.ruby</string>
-						</dict>
-					</dict>
-					<key>end</key>
-					<string>\]</string>
-					<key>name</key>
-					<string>string.regexp.character-class.ruby</string>
-					<key>patterns</key>
-					<array>
-						<dict>
-							<key>include</key>
-							<string>#escaped_char</string>
-						</dict>
-					</array>
-				</dict>
-				<dict>
-					<key>begin</key>
-					<string>\(</string>
-					<key>captures</key>
-					<dict>
-						<key>0</key>
-						<dict>
-							<key>name</key>
-							<string>punctuation.definition.group.ruby</string>
-						</dict>
-					</dict>
-					<key>end</key>
-					<string>\)</string>
-					<key>name</key>
-					<string>string.regexp.group.ruby</string>
-					<key>patterns</key>
-					<array>
-						<dict>
-							<key>include</key>
-							<string>#regex_sub</string>
-						</dict>
-					</array>
-				</dict>
-				<dict>
-					<key>captures</key>
-					<dict>
-						<key>1</key>
-						<dict>
-							<key>name</key>
-							<string>punctuation.definition.comment.ruby</string>
-						</dict>
-					</dict>
-					<key>comment</key>
-					<string>We are restrictive in what we allow to go after the comment character to avoid false positives, since the availability of comments depend on regexp flags.</string>
-					<key>match</key>
-					<string>(?&lt;=^|\s)(#)\s[[a-zA-Z0-9,. \t?!-][^\x{00}-\x{7F}]]*$</string>
-					<key>name</key>
-					<string>comment.line.number-sign.ruby</string>
-				</dict>
-			</array>
-		</dict>
-	</dict>
-	<key>scopeName</key>
-	<string>source.ruby</string>
-	<key>uuid</key>
-	<string>E00B62AC-6B1C-11D9-9B1F-000D93589AF6</string>
-</dict>
-</plist>
diff --git a/bundles/ruby.tmbundle/Tests/division_ambiguity.rb b/bundles/ruby.tmbundle/Tests/division_ambiguity.rb
deleted file mode 100644
index a20e52a46..000000000
--- a/bundles/ruby.tmbundle/Tests/division_ambiguity.rb
+++ /dev/null
@@ -1,88 +0,0 @@
-# purpose:
-# exercise constructs with division
-#
-# division itself      84 / 2
-# regexp               /pattern/
-#
-#
-#
-
-def test(*obj)
-	p(*obj)
-end
-a, b = 4, 2
-
-# -------------------------------------------
-#
-# Testarea for division
-#
-# -------------------------------------------
-
-# singleline numbers
-test(84 / 2)
-
-# singleline symbols
-test(a / b)
-
-# singleline symbols
-test(a / b / 3)
-
-
-test(Float(42) / Float(5))
-
-# multiline with symbols
-=begin # invalid
-test(a 
-/ b)
-=end
-
-# multiline with symbols
-test(a / 
-b)
-
-
-# -------------------------------------------
-#
-# Testarea for regexp
-#
-# -------------------------------------------
-
-# singleline
-test( // )
-test( /abc/ )
-test( /a\/bc/ )
-test [/^F../]
-p 'Foobar'[/^F../]
-p '42' =~ /42/
-test(nil && /\\/ =~ '\\')
-test(nil || /\\/ =~ '\\')
-test(nil and /\\/ =~ '\\')
-test(nil or /\\/ =~ '\\')
-test(/a/x)
-test(/x/.match('abx').to_s)
-test((/x/).match('abx').to_s)
-test(/a/,/b/,/c/)
-test(/a/x,/b/x,/c/m)
-
-
-# multiline
-test( /
-pattern
-/x    )
-
-
-# multiline
-test( 
-/r
-eg
-e/x
-)
-
-# multiline
-test( 
-/1/,/2/,/3/
-)
-
-# regexp after keyword
-res = case 'test';when /t..t/:1;else 0;end
-test(res)
\ No newline at end of file
diff --git a/bundles/ruby.tmbundle/Tests/modulo_ambiguity1.rb b/bundles/ruby.tmbundle/Tests/modulo_ambiguity1.rb
deleted file mode 100644
index 2b1b9f717..000000000
--- a/bundles/ruby.tmbundle/Tests/modulo_ambiguity1.rb
+++ /dev/null
@@ -1,76 +0,0 @@
-# purpose:
-# exercise constructs with modulo
-#
-# modulo in math       data%2
-# literals             %(a b), %W[1 2]
-#
-#
-#
-
-def test(v)
-	p v
-end
-
-x, y = 42, 33
-
-
-# -------------------------------------------
-#
-# Testarea for modulo
-#
-# -------------------------------------------
-
-# value % value
-test( 3%2 )
-test( 3 % 2 )
-test( 1234%(666) )
-test( (1234)%666 )
-
-# var % value
-test( x%2 )
-test( x%666 )
-test( x%(42) )
-test( x%-42-3 )
-test( x%+42+3 )
-
-# value % var
-test( 666%x )
-test( (42+4+2)%x )
-
-# var % var
-test( x % y )
-test( x%y )
-
-# -------------------------------------------
-#
-# Testarea for literals
-#
-# -------------------------------------------
-
-# literal with nothing 
-test( %(a b c) )
-test( %(1 2 (3 4)) )
-test( %{TM rocks} )
-
-# literal with 'w' 
-test( %W(1 2 3) )
-test( %W[1 2 3] )
-test( %W{1 2 3} )
-test( %W<1 2 3> )
-
-# literal with 'w'  (multiline)
-test(%w(a
-b))
-
-# literal with 'q' 
-test( %q(1 2 3) )
-test( %Q(1 2 3) )
-
-# literal with custom
-test( %q"1 2 3" )
-test( %q'1 2 3' )
-test( %q#1 2 3# )
-test( %?X.tainted? )
-test( %q/1 2 3/ )
-test( %q|1 2 3| )
-test( %q\1 2 3\ )
diff --git a/bundles/ruby.tmbundle/Tests/questionmark_ambiguity1.rb b/bundles/ruby.tmbundle/Tests/questionmark_ambiguity1.rb
deleted file mode 100644
index d571673fa..000000000
--- a/bundles/ruby.tmbundle/Tests/questionmark_ambiguity1.rb
+++ /dev/null
@@ -1,160 +0,0 @@
-# purpose:
-# exercise constructs with questionmark
-#
-# numeric letters      ?x
-# ternary operator     condition ? case1 : case2
-#
-#
-#
-
-def test(v)
-	puts "#{v.inspect} => #{v.chr}"
-end
-def z(v)
-	v
-end
-
-
-
-# -------------------------------------------
-#
-# Testarea for numeric letters
-#
-# -------------------------------------------
-
-# begin of line
-test(
-?x) 
-
-# normal letters
-test( ?a )
-test( ?A )
-test( ?0 )
-
-# misc symbols
-test( ?* )
-test( ?**2 )
-test( ?: )
-test( ?) )
-test( ?( )
-test( ?' )   # im a comment, not a string
-test( ?" )   # im a comment, not a string
-test( ?/ )   # im a comment, not a regexp
-
-# symbol '.'
-test( ?..succ )
-p ?...?..succ     # im a .. range
-p ?....?..succ    # im a ... range
-#p ?.....?..succ    # invalid
-
-# symbol '#'
-test( ?# ); p 'im not a comment' 
-
-# space ' '
-#test( ?  )     # invalid
-
-# tab '	'
-#test( ?	 )     # invalid
-
-
-# symbol '?'
-test( ?? )    
-test(??)
-
-# symbol '\\'
-test( ?\\ )
-
-# escaped as hex
-#test( ?\x )     # invalid
-test( ?\x1 )
-test( ?\x61 )
-#test( ?\x612 )  # invalid
-test( ?\X )   # valid.. but is not hex
-#test( ?\X11 )   # invalid
-
-# escaped as octal
-test( ?\0 )
-test( ?\07 )
-test( ?\017 )
-#test( ?\0173 )   # invalid
-#test( ?\08 )     # invalid
-#test( ?\09 )     # invalid
-#test( ?\0a )     # invalid
-test( ?\1 )
-test( ?\7 )
-test( ?\a )
-test( ?\f )
-
-# standard escapings
-test( ?\n )  # newline
-test( ?\b )  # backspace
-
-# escaped misc letters/symbols
-test( ?\8 )
-test( ?\9 )
-test( ?\_ )
-
-# ctrl/meta escaped
-test( ?\C-a )
-test( ?\C-g )
-test( ?\C-x )
-test( ?\C-A )
-test( ?\C-G )
-test( ?\c )
-test( ?\m )
-#test( ?\c-a )   # invalid
-#test( ?\C )     # invalid
-#test( ?\M )     # invalid
-test( ?\M-a )
-test( ?\M-\C-a )
-test( ?\C-\C-\M-a )
-test( ?\C-\M-a )
-test( ?\C-\M-\M-a )
-test( ?\C-\M-\C-\M-a )
-
-# misc tests
-p 'abc'.include?(?z)
-
-
-
-# -------------------------------------------
-#
-# Testarea for ternary operator
-#
-# -------------------------------------------
-a, b, val = 42, 24, true
-p(val ? 0 : 2)
-
-p [
- val ? (a) : z(b)    ,
- val ? 'a' : 'b'
-]
-
-
-
-
-# -------------------------------------------
-#
-# Testarea for ternary operator and numeric letter
-#
-# -------------------------------------------
-p [
-
-# very ugly
-true ???:??    ,
-true ???:?:    ,
-true ??::?:    ,
-]
-
-
-
-# -------------------------------------------
-#
-# Testarea for neiter ternary operator nor numeric letter
-#
-# -------------------------------------------
-
-# not letters.. the questionmark is part of the methodname
-p(42.tainted?, 42.frozen?)
-
-
diff --git a/bundles/ruby.tmbundle/Tests/rubylexer/COPYING b/bundles/ruby.tmbundle/Tests/rubylexer/COPYING
deleted file mode 100644
index b124cf581..000000000
--- a/bundles/ruby.tmbundle/Tests/rubylexer/COPYING
+++ /dev/null
@@ -1,510 +0,0 @@
-
-                  GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-                            Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations
-below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it
-becomes a de-facto standard.  To achieve this, non-free programs must
-be allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
-                  GNU LESSER GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control
-compilation and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at least
-    three years, to give the same user the materials specified in
-    Subsection 6a, above, for a charge no more than the cost of
-    performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply, and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License
-may add an explicit geographical distribution limitation excluding those
-countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-                            NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-                     END OF TERMS AND CONDITIONS
-
-           How to Apply These Terms to Your New Libraries
-
-  If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change.  You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms
-of the ordinary General Public License).
-
-  To apply these terms, attach the following notices to the library.
-It is safest to attach them to the start of each source file to most
-effectively convey the exclusion of warranty; and each file should
-have at least the "copyright" line and a pointer to where the full
-notice is found.
-
-
-    <one line to give the library's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or
-your school, if any, to sign a "copyright disclaimer" for the library,
-if necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the
-  library `Frob' (a library for tweaking knobs) written by James
-  Random Hacker.
-
-  <signature of Ty Coon>, 1 April 1990
-  Ty Coon, President of Vice
-
-That's all there is to it!
-
-
diff --git a/bundles/ruby.tmbundle/Tests/rubylexer/g.rb b/bundles/ruby.tmbundle/Tests/rubylexer/g.rb
deleted file mode 100644
index 16df18d19..000000000
--- a/bundles/ruby.tmbundle/Tests/rubylexer/g.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-j=9;def i(n) [n ?"d" : "e" , n] end
-
-p(i ?")
-p(j ?"d" : "e")
-
-def g(x=nil) x end
-def gg(x=nil) g x end
-p(gg :x)
-p(g :y)
-g=9
-p(gg :z)
-# g :w #error
-
-
diff --git a/bundles/ruby.tmbundle/Tests/rubylexer/newsyntax.rb b/bundles/ruby.tmbundle/Tests/rubylexer/newsyntax.rb
deleted file mode 100644
index 2d06fe082..000000000
--- a/bundles/ruby.tmbundle/Tests/rubylexer/newsyntax.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-
-x, (*), z = [:x, :y, :z]
-p x
-p z
-
-x, (*y), z = [:x, :y, :z]
-p x
-p y
-p z
-
-p($/ = ' '; Array( "i'm in your house" ))
-
-class Foou
- public
- def [] x=-100,&y=nil; p x; 100 end
-end
-p Foou.new.[]?9      #value
-p Foou.new.[] ?9     #value
diff --git a/bundles/ruby.tmbundle/Tests/rubylexer/p.rb b/bundles/ruby.tmbundle/Tests/rubylexer/p.rb
deleted file mode 100644
index 90df69671..000000000
--- a/bundles/ruby.tmbundle/Tests/rubylexer/p.rb
+++ /dev/null
@@ -1,1122 +0,0 @@
-p(String *Class)
-class String
-class Class
-end
-end
-#def String(x) x.to_s end #it's already built-in. duh!
-def String.*(right) [self,right] end
-def String.<<(right) [self,:<<,right] end
-def String./(right) [self,:/,right] end
-def String.[](right) [self,:[],right] end
-p(String::Class)
-p(String:: Class)
-p(String ::Class)
-p(String :: Class)
-p(String<<Class)
-p(String<< Class)
-p(String <<Class) 
-sgsdfgf
-Class
-p(String << Class)
-p(String/Class)
-p(String/ Class)
-p(String /Class/) 
-p(String / Class) #borken
-p(String[Class])
-p(String[ Class])
-p(String [Class]) 
-p(String [ Class]) 
-p(String*Class)
-p(String* Class)
-p(String *Class) 
-p(String * Class)
-class <<String
-undef :*,<<,/,[]
-end
-
-
-
-p(false::to_s)
-p(false ::to_s)
-p(false:: to_s)
-p(false :: to_s)
-
-class C2
-class <<self
-  def self.p8; p 8 end
-  alias p? p
-  alias P? p
-  alias [] p
-  alias <=> p
-end
-
-q=9
-Q=99
-
-p:p8
-false ? p: p8
-p :p8
-false ? p : p8
-
-false ? q:p8
-false ? q: p8
-false ? q :p8
-false ? q : p8
-
-#false ? Q:p8  #gives ruby indigestion
-false ? Q: p8
-#false ? Q :p8  #gives ruby indigestion
-false ? Q : p8
-
-p?:p8
-false ? p?: p8
-p? :p8
-false ? p? : p8
-
-P?:p8
-false ? P?: p8
-P? :p8
-false ? P? : p8
-
-self.[]:p8
-false ? self.[]: p8
-self.[] :p8
-false ? self.[] : p8
-
-self.<=>:p8
-false ? self.<=>: p8
-self.<=> :p8
-false ? self.<=> : p8
-
-self <=>:p8
-#false ? self <=>: p8  #gives ruby indigestion
-self <=> :p8
-#false ? self <=> : p8  #gives ruby indigestion
-end
-
-p <<stuff+'foobar'.tr('j-l','d-f')
-"more stuff"
-12345678
-the quick brown fox jumped over the lazy dog
-stuff
-
-
-p <<p
-sdfsfdf^^^^@@@
-p
-mix=nil
-p / 5/mix
-
-module M33
-  p="var:"
-  Q="func:"
-  def Q.method_missing(name,*args)
-    self+name.to_s+(args.join' ')
-  end
-  def p.method_missing(name,*args)
-    self+name.to_s+(args.join' ')
-  end
-  def self.p(*a); super; Q end
-  @a=1
-  $a=2
-  
-  p(p~6)
-  p(p ~6)
-  p(p~ 6)
-  p(p ~ 6)
-  p(p*11)
-  p(p *11)
-  p(p* 11)
-  p(p * 11)
-  p(p&proc{})
-  p(p &proc{})
-  p(p& proc{})
-  p(p & proc{})
-  p(p !1)
-#  p(p ?1) #compile error, when p is var
-  p(p ! 1)
-  p(p ? 1 : 6)
-  p(p@a)
-  p(p @a)
-#  p(p@ a)  #wont
-#  p(p @ a) #work 
-  p(p#a
-)
-  p(p #a
-)
-  p(p# a
-)
-  p(p # a
-)
-  p(p$a)
-  p(p $a)
-#  p(p$ a)  #wont
-#  p(p $ a) #work
-  p(p%Q{:foo})
-  p(p %Q{:foo})
-  p(p% Q{:foo})
-  p(p % Q{:foo})
-  p(p^6)
-  p(p ^6)
-  p(p^ 6)
-  p(p ^ 6)
-  p(p&7)
-  p(p &proc{7})
-  p(p& 7)
-  p(p & 7)
-  p(p(2))
-  p(p (2))
-  p(p( 2))
-  p(p ( 2))
-  p(p(p))
-  p(p())
-  p(p (p))
-  p(p ())
-  p(p ( p))
-  p(p ( ))
-  p(p( p))
-  p(p( ))
-  p(p)
-  p((p))
-  p(p )
-  p((p ))
-  p((p p))
-  p((p p,p))
-  p((p p))
-  p((p p,p))
-  p(p-0)
-  p(p -0)
-  p(p- 0)
-  p(p - 0)
-  p(p+9)
-  p(p +9)
-  p(p+ 9)
-  p(p + 9)
-  p(p[1])
-  p(p [1])
-  p(p[ 1])
-  p(p [ 1])
-  p(p{1})
-  p(p {1})
-  p(p{ 1})
-  p(p { 1})
-  p(p/1)
-  p(p /22)
-  p(p/ 1)
-  p(p / 22)
-  p(p._)
-  p(p ._)
-  p(p. _)
-  p(p . _)
-  p(false ? p:f)
-  p(false ? p :f)
-  p(false ? p: f)
-  p(false ? p : f)
-  p((p;1))
-  p((p ;1))
-  p((p; 1))
-  p((p ; 1))
-  p(p<1)
-  p(p <1)
-  p(p< 1)
-  p(p < 1)
-  p(p<<1)
-  p(p <<1)
-  p(p<< 1)
-  p(p << 1)
-  p(p'j')
-  p(p 'j')
-  p(p' j')
-  p(p ' j')
-  p(p"k")
-  p(p "k")
-  p(p" k")
-  p(p " k")
-  p(p|4)
-  p(p |4)
-  p(p| 4)
-  p(p | 4)
-  p(p>2)
-  p(p >2)
-  p(p> 2)
-  p(p > 2)
-  
-end
-
-module M34
-  p(p~6)
-  p(p ~6)
-  p(p~ 6)
-  p(p ~ 6)
-  p(p*[1])
-  p(p *[1])
-  p(p* [1])
-  p(p * [1])
-  p(p&proc{})
-  p(p &proc{})
-  p(p& proc{})
-  p(p & proc{})
-  p(p !1)
-  p(p ?1)
-  p(p ! 1)
-  p(p ? 1 : 6)
-  p(p@a)
-  p(p @a)
-#  p(p@ a)  #wont
-#  p(p @ a) #work 
-
-  p(p#a
-)
-  p(p #a
-)
-  p(p# a
-)
-  p(p # a
-)
-  p(p$a)
-  p(p $a)
-#  p(p$ a)  #wont
-#  p(p $ a) #work
-  p(p%Q{:foo})
-  p(p %Q{:foo})
-  p(p% Q{:foo})
-  p(p % Q{:foo})
-  p(p^6)
-  p(p ^6)
-  p(p^ 6)
-  p(p ^ 6)
-  p(p&7)
-  p(p &proc{7})
-  p(p& 7)
-  p(p & 7)
-  p(p(2))
-  p(p (2))
-  p(p( 2))
-  p(p ( 2))
-  p(p(p))
-  p(p())
-  p(p (p))
-  p(p ())
-  p(p ( p))
-  p(p ( ))
-  p(p( p))
-  p(p( ))
-  p(p)
-  p((p))
-  p(p )
-  p((p ))
-  p((p p))
-  p((p p,p))
-  p((p p))
-  p((p p,p))
-  p(p-0)
-  p(p -1)
-  p(p- 0)
-  p(p - 0)
-  p(p+9)
-  p(p +9)
-  p(p+ 9)
-  p(p + 9)
-  p(p[1])
-  p(p [1])
-  p(p[ 1])
-  p(p [ 1])
-  p(p{1})
-  p(p {1})
-  p(p{ 1})
-  p(p { 1})
-  p(p/1)
-  p(p /22/)
-  p(p/ 1)
-  p(p / 22)
-  p(p._)
-  p(p ._)
-  p(p. _)
-  p(p . _)
-  p(p:f)
-  p(p :f)
-  p(false ? p: f)
-  p(false ? p : f)
-  p((p;1))
-  p((p ;1))
-  p((p; 1))
-  p((p ; 1))
-  p(p<1)
-  p(p <1)
-  p(p< 1)
-  p(p < 1)
-  p(p<<1)
-  p(p <<1)
-foobar
-1
-  p(p<< 1)
-  p(p << 1)
-  p(p'j')
-  p(p 'j')
-  p(p' j')
-  p(p ' j')
-  p(p"k")
-  p(p "k")
-  p(p" k")
-  p(p " k")
-  p(p|4)
-  p(p |4)
-  p(p| 4)
-  p(p | 4)
-  p(p>2)
-  p(p >2)
-  p(p> 2)
-  p(p > 2)
-  
-end
-
-
-def bob(x) x end
-def bill(x) x end
-p(bob %(22))
-for bob in [100] do p(bob %(22)) end
-p(bob %(22))
-def %(n) to_s+"%#{n}" end
-p(bill %(22))
-begin sdjkfsjkdfsd; rescue Object => bill; p(bill %(22)) end
-p(bill %(22))
-undef %
-
-class Object
-
-public :`
-def `(s)
-  print "bq: #{s}\n"
-end
-end
-
-69.`('what a world')
-
-79::`('what a word')
-
-p :`
-
-p{}
-p {}
-a=5
-p p +5
-p a +5
-
-def nil.+(x) ~x end
-def nil.[](*x) [x] end
-p( p + 5 )
-p( p +5 )
-p( p+5 )
-p( p[] )
-p( p [] )
-p( p [ ] )
-class NilClass; undef +,[] end
-
-class Foou
- public
- def [] x=-100,&y; p x; 100 end
-end
-a0=8
-p Foou.new.[]!false  #value
-p Foou.new.[] !false #value
-p Foou.new.[]~9      #value
-p Foou.new.[] ~9     #value
-p Foou.new.[]-9      #op
-p Foou.new.[]+9      #op
-p Foou.new.[] -9     #value
-p Foou.new.[] +9     #value
-p Foou.new.[]<<9     #op
-p Foou.new.[] <<9    #value
-foobar
-9
-p Foou.new.[]%9      #op
-p Foou.new.[]/9      #op
-p Foou.new.[] %(9)   #value
-p Foou.new.[] /9/    #value
-p Foou.new.[]$9      #value
-p Foou.new.[]a0      #value
-p Foou.new.[] $9     #value
-p Foou.new.[] a0     #value
-p Foou.new.[]{9}     #lambda (op)
-p Foou.new.[] {9}    #lambda (op)
-
-if p then p end
-
-p({:foo=>:bar})   #why does this work? i'd think that ':foo=' would be 1 token
-p   EMPTY = 0
-p   BLACK = 1
-p   WHITE = - BLACK
-
- a=b=c=0
-  a ? b:c
-  a ?b:c
-
-  p(a ? b:c)
-  p(a ?b:c)
-
-
-p~4
-p:f
-p(~4){}
-p(:f){}
-h={}
-h.default=:foo
-
-p def (h="foobar").default= v; p @v=v;v end
-p h
-
-p h.default=:b
-
-x, (*y) = [:x, :y, :z]
-p x
-p y
-
-x, *y = [:x, :y, :z]
-p x
-p y
-
-x, * = [:x, :y, :z]
-p x
-
-
-
-p Array("foo\nbar")
-
-
-
-p +(4)
-p -(4)
-
-p :'\\'
-
-class Foop
-  def Foop.bar a,b
-    p a,b
-  end
-end
-Foop.bar 1,2
-Foop::bar 3,4
-
-
-class Foop
-  def Foop::baz a,b
-    p :baz,a,b
-  end
-end
-Foop.baz 5,6
-Foop::baz 7,8
-
-
-
-without_creating=widgetname=nil
-      if without_creating && !widgetname #foo
-        fail ArgumentError,
-             "if set 'without_creating' to true, need to define 'widgetname'"
-      end
-
-
-
-=begin disable for now
-
-#class, module, and def should temporarily hide local variables
-def mopsdfjskdf arg; arg*2 end
-mopsdfjskdf=5
- class C
- p mopsdfjskdf %(3)    #calls method
- end
-
-module M
- p mopsdfjskdf %(4)    #calls method
-end
-
- def d
- p mopsdfjskdf %(5)    #calls method
- end
-p d
-p mopsdfjskdf %(6)     #reads variable
-p proc{mopsdfjskdf %(7)}[] #reads variable
-
-#fancy symbols not supported yet
-p %s{symbol}
-=end
-
-#multiple assignment test
-proc {
-  a,b,c,d,e,f,g,h,i,j,k=1,2,3,4,5,6,7,8,9,10,11
-  p(b %(c))
-  p(a %(c))
-  p(k %(c))
-  p(p %(c))
-}.call
-
-
-=begin disable for now
-p "#{<<kekerz}#{"foob"
-zimpler
-kekerz
-}"
-
-
-aaa=<<whatnot; p "#{'uh,yeah'
-gonna take it down, to the nitty-grit
-gonna tell you mother-fuckers why you ain't shit
-cause suckers like you just make me strong
-whatnot
-}"
-p aaa
-
-#test variable creation in string inclusion
-#currently broken because string inclusions
-#are lexed by a separate lexer!
-proc {
-  p "jentawz: #{baz=200}"
-  p( baz %(9))
-}.call
-=end
-
-=begin ought to work...ruby doesn't like
-class A
-class B
-class C
-end
-end
-end
-def A::B::C::d() :abcd end
-def A::B::d() :abd end   #this used to work as well... i think
-
-def nil.d=; end #this works
-def (;).d=; end
-def ().d=; end
-p def (p h="foobar";).default= v; p @v=v;v end
-p def (p h="foobar";h).default= v; p @v=v;v end
-
-p~4{}
-p:f{}
-p ~4{}
-p :f{}
-
-def g a=:g; [a] end
-g g g  #this works
-g *g   #this works
-g *g g #this doesn't
-
-[nil,p 5]
-"foo"+[1].join' '
-
-class Fook
-def foo; end
-
-
-#these work:
-(not true)
-p(!true) #etc
-(true if false) #etc
-(true and false) #etc
-(undef foo)
-(alias bar foo)
-(BEGIN{p :yyy})
-
-#these don't:
-p(not true)
-p(true if false) #etc
-p(true and false) #etc
-p(undef foo)
-p(alias bar foo)
-p(BEGIN{p :yyy})
-end
-
-=end
-
-proc {
-}
-
-p "#{<<foobar3}"
-bim
-baz
-bof
-foobar3
-
-def func
-  a,b,* = [1,2,3,4,5,6,7,8]
-  p a,b
-  a,b, = [1,2,3,4,5,6,7,8]
-  p a,b
-
-  a,b = [1,2,3,4,5,6,7,8]
-  p a,b
-  a,*b = [1,2,3,4,5,6,7,8]
-  p a,b
-
-  a,b,*c=[1,2,3,4,5,6,7,8]
-  a,b,* c=[1,2,3,4,5,6,7,8]
-end
-func
-
-
-p( %r{\/$})
-p( %r~<!include:([\/\w\.\-]+)>~m)
-
-p <<end
-#{compile_body}\
-#{outvar}
-end
-
-
-
-
-
-proc {
-  h={:a=>(foo=100)}
-  p( foo %(5))
-}.call
-
-
-p "#{<<foobar3}"
-bim
-baz
-bof
-foobar3
-
-p "#{<<foobar2
-bim
-baz
-bof
-foobar2
-}"
-
-p <<one ; p "#{<<two}"
-1111111111111111
-fdsgdfgdsfffff
-one
-2222222222222222
-sdfasdfasdfads
-two
-p "#{<<foobar0.each('|'){|s| '\nthort: '+s} }"
-jbvd|g4543ghb|!@G$dfsd|fafr|e
-|s4e5rrwware|BBBBB|*&^(*&^>"PMK:njs;d|
-
-foobar0
-
-p "#{<<foobar1.each('|'){|s| '\nthort: '+s}
-jbvd|g4543ghb|!@G$dfsd|fafr|e
-|s4e5rrwware|BBBBB|*&^(*&^>"PMK:njs;d|
-
-foobar1
-}"
-
-def foo(a=<<a,b=<<b,c=<<c)
-jfksdkjf
-dkljjkf
-a
-kdljfjkdg
-dfglkdfkgjdf
-dkf
-b
-lkdffdjksadhf
-sdflkdjgsfdkjgsdg
-dsfg;lkdflisgffd
-g
-c
-
-   a+b+c
-
-end
-p foo
-
-
-
-$a=1
-@b=2
-@@c=3
-p "#$a #@b #@@c #{$a+@b+@@c}"
-p "\#$a \#@b \#@@c \#{$a+@b+@@c}"
-p '#$a #@b #@@c #{$a+@b+@@c}'
-p '\#$a \#@b \#@@c \#{$a+@b+@@c}'
-p %w"#$a #@b #@@c #{$a+@b+@@c}"
-p %w"\#$a \#@b \#@@c \#{$a+@b+@@c}"
-p %W"#$a #@b #@@c #{$a+@b+@@c}"
-p %W"\#$a \#@b \#@@c \#{$a+@b+@@c}"
-p %Q[#$a #@b #@@c #{$a+@b+@@c}]
-p %Q[\#$a \#@b \#@@c \#{$a+@b+@@c}]
-p `echo #$a #@b #@@c #{$a+@b+@@c}`
-p `echo \#$a \#@b \#@@c \#{$a+@b+@@c}`
-p(/#$a #@b #@@c #{$a+@b+@@c}/)
-#p(/\#$a \#@b \#@@c \#{$a+@b+@@c}/) #moved to w.rb
-
-class AA; class BB; class CC
-FFOO=1
-end end end
-
-p AA::BB::CC::FFOO
-
-compile_body=outvar='foob'
-
-if false
- method_src = c.compile(template, (HtmlCompiler::AnyData.new)).join("\n") +
-    "\n# generated by PartsTemplate::compile_partstemplate at #{Time.new}\n"
- rescu -1
-end
-
-  p('rb_out', 'args', <<-'EOL')
-    regsub -all {!} $args {\\!} args
-    regsub -all "{" $args "\\{" args
-    if {[set st [catch {ruby [format "TkCore.callback %%Q!%s!" $args]} ret]] != 0} {
-        return -code $st $ret
-    } {
-        return $ret
-    }
-  EOL
-
-def add(*args)
-   self.<<(*args)
-end
-
-
-
-val=%[13,17,22,"hike", ?\s]
-    if val.include? ?\s
-      p val.split.collect{|v| (v)}
-    end
-p "#{}"
-p "#(1)"
-class Hosts
-end
-class DNS < Hosts
-end
-def intialize(resolvers=[Hosts.new, DNS.new]) end
-def environment(env = File.basename($0, '.*')) end
-
-def ssssss &block
-end
-def params_quoted(field_name, default)
-  if block_given? then yield field_name else default end
-end
-def ==(o) 444 end
-def String.ffff4() self.to_s+"ffff" end
-
-p *[]
-for i in \
-[44,55,66,77,88] do p i**Math.sqrt(i) end
-
-#(
-for i in if
-false then foob12345; else [44,55,66,77,88] end do p i**Math.sqrt(i) end
-#)
-(
-for i in if false then
-foob12345; else [44,55,66,77,88] end do p i**Math.sqrt(i) end
-
-c=j=0
-until while j<10 do j+=1 end.nil? do p 'pppppppppp' end
-for i in if false then foob12345;
-else [44,55,66,77,88] end do p i**Math.sqrt(i) end
-
-for i in if false then foob12345; else
-[44,55,66,77,88] end do p i**Math.sqrt(i) end
-
-
-for i in (c;
-[44,55,66,77,88]) do p i**Math.sqrt(i) end
-)
-(
-
-for i in (begin
-[44,55,66,77,88] end) do p i**Math.sqrt(i) end
-
-for i in if false then foob12345; else
-[44,55,66,77,88] end do p i**Math.sqrt(i) end
-
-for i in (
-
-[44,55,66,77,88]) do p i**Math.sqrt(i) end
-
-for i in (
-[44,55,66,77,88]) do p i**Math.sqrt(i) end
-
-)
-
-
-def yy;yield end
-
-block=proc{p "blah  blah"}
-
-yy &block
-p(1.+1)
-p pppp
-
-module M66
-p(proc do
-   p=123
-end.call)
-
-p proc {
-   p=123
-}.call
-
-p def pppp
-   p=123
-end
-p module Ppp
-   p=123
-end
-p class Pppp < String
-   p=123
-end
-end
-
-    def _make_regex(str) /([#{Regexp.escape(str)}])/n end
-p _make_regex("8smdf,34rh\#@\#$%$gfm/[]dD")
-
-
-p "#$a #@b #@@c
-
-d e f
-#$a #@b #@@c
-"
-
-p "\""
-
-a=a.to_s
-class <<a
-  def foobar
-     self*101
-  end
-  alias    eql?    ==
-end
-
-p a.foobar
-
-p(/^\s*(([+-\/*&\|^]|<<|>>|\|\||\&\&)=|\&\&|\|\|)/)
-p(:%)
-p( { :class => class_=0})
-p cls_name = {}[:class]
-
-
-p foo
-p "#{$!.class}"
-p :p
-p(:p)
-p(:"[]")
-p :"[]"
-p("\\")
-p(/\\/)
-p(/[\\]/)
-p 0x80
-p ?p
-p 0.1
-p 0.8
-p 0.9
-p(-1)
-p %/p/
-p %Q[<LI>]
-i=99
-p %Q[<LI><A HREF="#{i[3]}.html\##{i[4]}">#{i[0]+i[1]+(i[2])}</A>\n]
-p(:side=>:top)
-p %w[a b c
-     d e f]
-p %w[a b c\n
-     d e f]
-p %w[\\]
-p %w[\]]
-p :+
-p 99 / 3
-
-a=99;b=3
-p 1+(a / b)
-p %Q[\"]
-p %Q[ some [nested] text]
-
-if false
-     formatter.format_element(element) do
-       amrita_expand_and_format1(element, context, formatter)
-     end
-end
-if false
- ret = <<-END
- @@parts_template = #{template.to_ruby}
- def parts_template
-   @@parts_template
- end
-
- #{c.const_def_src.join("\n")}
- def amrita_expand_and_format(element, context, formatter)
-   if element.tagname_symbol == :span and element.attrs.size == 0
-     amrita_expand_and_format1(element, context, formatter)
-   else
-     formatter.format_element(element) do
-       amrita_expand_and_format1(element, context, formatter)
-     end
-   end
- end
-
- def amrita_expand_and_format1(element, context, formatter)
-   #{method_src}
- end
- END
- j=55
-end
-
-p '
-'
-p '\n'
-p "
-"
-p "\n"
-p %w/
-/
-p %w/\n/
-
-p %W/
-/
-p %W/\n/
-p(/
-/)
-p(/\n/)
-p proc {
-  p `
-  `
-  p `\n`
-}
-
-
-
-p(%r[foo]i)
-#breakpoint
-p <<stuff+'foobar'.tr('j-l','d-f')
-"more stuff"
-12345678
-the quick brown fox jumped over the lazy dog
-stuff
-
-=begin doesn't work
-p <<stuff+'foobar'.tr('j-l','d-f')\
-+"more stuff"
-12345678
-the quick brown fox jumped over the lazy dog
-stuff
-=end
-
-p ENV["AmritaCacheDir"]
-p <<-BEGIN + <<-END
-          def element_downcase(attributes = {})
-        BEGIN
-          end
-        END
-
-
-
-p <<ggg; def
-kleegarts() p 'kkkkkkk' end
-dfgdgfdf
-ggg
-koomblatz!() p 'jdkfsk' end
-
-koomblatz!
-
-p f = 3.7517675036461267e+17
-p $10
-p $1001
-p( <<end )
-nine time nine men have stood untold.
-end
-
-def jd_to_wday(jd) (jd + 1) % 7 end
-p jd_to_wday(98)
-
-
-p    pre = $`
-=begin
-=end
-
-p <<"..end .."
-cbkvjb
-vb;lkxcvkbxc
-vxlc;kblxckvb
-xcvblcvb
-..end ..
-
-p $-j=55
-
-def empty() end
-
-p <<a
-dkflg
-flk
-a
-
-label='label';tab=[1,2,3]
-      p <<S
-#{label} = arr = Array.new(#{tab.size}, nil)
-str = a = i = nil
-idx = 0
-clist.each do |str|
-  str.split(',', -1).each do |i|
-    arr[idx] = i.to_i unless i.empty?
-    idx += 1
-  end
-end
-
-S
-def printem1 a,b,c
-   p(a +77)
-   p(b +77)
-   p(c +77)
-end
-
-def foobar() end
-def foobar2
-end
-
-def printem0(a)
-   p(a +77)
-end
-def printem0(a,b,c)
-   p(a +77)
-   p(b +77)
-   p(c +77)
-end
-def printem2 a,b,c; p(a +77); p(b +77); p(c +77) end
-def three() (1+2) end
-
-def d;end
-def d()end
-def d(dd)end
-
-def printem a,b,c
-   p a;p b;p c
-   p(a +77)
-   p(b %(0.123))
-end
-printem 1,2,3
-
-a=1
-p(a +77)
-
-def hhh(a=(1+2)) a end
-
-
-
-END {
-  p "bye-bye"
-}
-
-
-p <<here
-where?
-here
-p <<-what
-     ? that's
-  what
-p proc{||}
-for i in if false
-foob12345; else [44,55,66,77,88] end do p i**Math.sqrt(i) end
-p "\v"
-c=0
-      while c == /[ \t\f\r\13]/; end
-
-
-
-
-
-
-
diff --git a/bundles/ruby.tmbundle/Tests/rubylexer/regtest.rb b/bundles/ruby.tmbundle/Tests/rubylexer/regtest.rb
deleted file mode 100644
index 4e3f1e683..000000000
--- a/bundles/ruby.tmbundle/Tests/rubylexer/regtest.rb
+++ /dev/null
@@ -1,621 +0,0 @@
-#!/usr/bin/ruby -w -d
-require "reg"
-require "regarray"
-require "reglogic"
-require "reghash"
-require "regvar"
-require "assert"
-require 'getoptlong'
-
-#require 'test/unit'
-class TC_Reg #< Test::Unit::TestCase
-  class <<self
-
-
-  def randsym
-    as=Symbol.all_symbols
-    as[rand as.size]
-  end
-
-  def makelendata(num=20,mask=0b11111111111,mischief=false)
-    result=[]
-    (1..num).each do
-      begin type=rand(11) end until 0 != mask&(1<<type)
-      len=type==0 ? 0 : rand(4)
-
-      result<<case type
-        when 0    then [0]
-        when 1 then [len]+(1..len).map{randsym}
-        when 2 then (1..len).map{randsym}+[-len]
-        when 3 then (1..len).map{randsym}+["infix#{len}"]+(1..len).map{randsym}
-        when 4
-          [:Q] +
-            (1..len).map{randsym}.delete_if {|x|:Q==x} +
-            (1..rand(4)).map{randsym}.delete_if {|x|:Q==x} +
-          [:Q]
-        when 5
-          [:Q] +
-            (1..len).map{randsym}.delete_if {|x|:Q==x} +
-            [:'\\', :Q] +
-            (1..rand(4)).map{randsym}.delete_if {|x|:Q==x} +
-          [:Q]
-
-        when 6
-          [:q]+(1..len).map{randsym}.delete_if {|x|:q==x}+[:q]
-
-        when 7
-          [:begin]+
-            (1..len).map{randsym}.delete_if {|x| :begin==x or :end==x} +
-            (1..rand(4)).map{randsym}.delete_if {|x| :begin==x or :end==x} +
-          [:end]
-
-        when 8
-          [:begin]+
-            (1..len).map{randsym}.delete_if {|x| :begin==x or :end==x} +
-            [:'\\', 0==rand(1) ? :begin : :end] +
-            (1..rand(4)).map{randsym}.delete_if {|x| :begin==x or :end==x} +
-          [:end]
-
-        when 9
-          [:begin]+
-            (1..len).map{randsym}.delete_if {|x| :begin==x or :end==x} +
-            [:begin]+(1..len).map{randsym}.delete_if {|x| :begin==x or :end==x} +[:end]+
-            (1..rand(4)).map{randsym}.delete_if {|x| :begin==x or :end==x} +
-          [:end]
-
-        when 10
-          [:begin]+
-            (1..len).map{randsym}.delete_if {|x| :begin==x or :end==x} +
-            [:'\\', 0==rand(1)? :begin : :end] +
-            (1..rand(4)).map{randsym}.delete_if {|x| :begin==x or :end==x} +
-            [:begin]+(1..len).map{randsym}.delete_if {|x| :begin==x or :end==x} +[:end]+
-            (1..rand(4)).map{randsym}.delete_if {|x| :begin==x or :end==x} +
-          [:end]
-      end
-    end
-    mischief and result.insert(rand(result.size),mischief)
-    return result
-  end
-
-
-  def test_reg
-     lenheadalts=-[0]|-[1,OB]|-[2,OB*2]|-[3,OB*3]|-[4,OB*4]
-     lenheadlist=lenheadalts+1
-
-     lenheaddata=[0,0,0,1,:foo,4,:foo,:bar,:baz,:zork,3,:k,77,88]
-     lenheaddataj=lenheaddata+[:j]
-
-
-     #not used yet:
-     lentailalts=-[OB,-1]|-[OB*2,-2]|-[OB*3,-3]|-[OB*4,-4]
-     lentaildata=lenheaddata.reverse.map {|x| Integer===x ? -x : x }
-     infixalts=-[OB,"infix1",OB]|-[OB*2,'infix2',OB*2]|
-               -[OB*3,'infix3',OB*3]|-[OB*4,'infix4',OB*4]
-
-
-     qq=-[:q, ~(:q.reg)+0, :q]
-     _QQ=-[:Q, ( ~/^[Q\\]$/.sym | -[:'\\',OB] )+0, :Q]
-
-
-     be=-[:begin, (
-           ~/^(begin|end|\\)$/.sym |
-           -[:'\\',OB] |
-           innerbe=Reg.const
-         )+0, :end]
-     innerbe.set! be
-
-     lh_or_qq=lenheadalts|qq|_QQ
-     lhqqbe=lh_or_qq|be
-
-
-
-
-
-
-
-
-#broken:
-#eat_unworking=<<'#end unworking'
-     a=[:foo]*4
-     x=(OB*2*(1..2)).mmatch(a,2)
-     assert x.next_match(a,2)==[[[[:foo, :foo]]], 2]
-     assert x.next_match(a,2)==nil
-
-     assert_eee OB*(1..2)*2,[:foo]*2
-
-     a=[:foo]*3
-     x=(OB*(1..2)*2).mmatch(a,0)
-     assert x.next_match(a,0)==
-       [[ [[:foo, :foo]], [[:foo]] ], 3]
-     assert x.next_match(a,0)==
-       [[ [[:foo]], [[:foo, :foo]] ], 3]
-     assert x.next_match(a,0)==
-       [[ [[:foo]], [[:foo]] ], 2]
-     assert x.next_match(a,0).nil?
-
-     a=[:foo]*6
-     x=(OB*2*(1..2)*2).mmatch(a,0)
-     assert x.next_match(a,0)==
-       [[ [[[:foo, :foo]], [[:foo, :foo]]], [[[:foo, :foo]]] ], 6]
-     assert x.next_match(a,0)==
-       [[ [[[:foo, :foo]]], [[[:foo, :foo]], [[:foo, :foo]]] ], 6]
-     assert x.next_match(a,0)==
-       [[ [[[:foo, :foo]]], [[[:foo, :foo]]] ], 4]
-     assert x.next_match(a,0).nil?
-
-$RegTraceEnable=true
-     assert_eee Reg[OB*2*(1..2)*2], [:foo]*6
-     assert_eee Reg[OB*2*(1..2)*2, OB-1], [:foo]*7
-     assert_eee Reg[OB*2*(1..2)*2], [:foo]*8
-     assert_eee Reg[OB*2*(1..2)*2], [:foo]*4
-     assert_eee Reg[OB*(2..3)*(1..2)*2], [:foo]*4
-     assert_eee Reg[OB*(2..3)*(2..3)*(1..2)], [:foo]*4
-     assert_eee Reg[OB*(2..2)*(2..3)*(2..3)], [:foo]*8
-     assert_eee Reg[OB*(2..3)*(2..2)*(2..3)], [:foo]*8
-
-     assert_eee Reg[OB*(2..3)*(2..3)*2], [:foo]*8
-     assert_eee Reg[OB*(2..3)*(2..3)*(2..3)], [:foo]*8
-     assert_eee Reg[OB+2+2+2], [:foo]*8
-     assert_eee Reg[OB+2+2+2], [:foo]*9
-     assert_ene Reg[:foo.reg*(2..3)*(2..3)*2], [:foo]*7
-
-     assert(!(Reg[OB*1*(1..2)]===[:f]).first.empty?)
-     #btracing monsters
-     0.upto(5) {|i|
-       assert_ene Reg[OB+1+3+2], [:f]*i }
-     6.upto(16){|i| assert_eee Reg[OB+1+3+2], [:f]*i }
-
-     assert_ene Reg[OB+2+3+2], [:f]*11
-     assert_eee Reg[OB+2+3+2], [:f]*12
-     assert_ene Reg[OB+2+3+3], [:f]*17
-     assert_eee Reg[OB+2+3+3], [:f]*18
-     assert_ene Reg[OB+3+3+3], [:f]*26
-     assert_eee Reg[OB+3+3+3], [:f]*27
-     assert_ene Reg[OB+4+4+4], [:f]*63
-     assert_eee Reg[OB+4+4+4], [:f]*64
-     assert_ene Reg[OB+2+2+2+2], [:f]*15
-     assert_eee Reg[OB+2+2+2+2], [:f]*16
-     assert_ene Reg[OB+2+2+2+2+2+2+2+2], [:foo]*255
-     assert_eee Reg[OB+2+2+2+2+2+2+2+2], [:foo]*256
-
-     aaa_patho=+[-[/^a/]|-[/^.a/, OB]|-[/^..a/, OB*2]]
-     assert_eee aaa_patho, ["aaa"]*200
-
-
-
-     assert_ene Reg[OB+1+2+2], [:f]*3
-     assert_ene Reg[OB+2+1+2], [:f]*3
-     assert_eee Reg[OB+2+1+2], [:f]*4
-     assert_ene Reg[OB+2+2+2], [:f]*7
-     assert_eee Reg[OB+2+2+2], [:f]*8
-
-     assert_ene Reg[OB+2+2+3], [:f]*11
-     assert_eee Reg[OB+2+2+3], [:f]*12
-     assert_eee Reg[OB+2+2+3], [:f]*16
-
-     assert_ene Reg[5.reg+1+3+2], [6]+[5]*5
-     assert_ene Reg[5.reg+1+3+2], [5]+[6]+[5]*4
-     assert_ene Reg[5.reg+1+3+2], [5]*2+[6]+[5]*3
-     assert_ene Reg[5.reg+1+3+2], [5]*3+[6]+[5]*2
-     assert_ene Reg[5.reg+1+3+2], [5]*4+[6,5]
-     assert_ene Reg[5.reg+1+3+2], [5]*5+[6]
-
-     assert_ene Reg[OB+1+3+2], [6]+[5]*5
-     assert_ene Reg[OB+1+3+2], [5]+[6]+[5]*4
-     assert_ene Reg[OB+1+3+2], [5]*2+[6]+[5]*3
-     assert_ene Reg[OB+1+3+2], [5]*3+[6]+[5]*2
-     assert_ene Reg[OB+1+3+2], [5]*4+[6,5]
-     assert_ene Reg[OB+1+3+2], [5]*5+[6]
-
-
-     assert_eee Reg[5.reg+1+3+2], [5]*6
-     assert_ene Reg[5.reg+2+2+2], [5]*8+[6]
-#end unworking
-
-#working:
-     assert_ene Reg[OB*(2..2)*(2..3)*(2..3)], [:foo]*7
-     assert_ene Reg[OB*(2..3)*(2..2)*(2..3)], [:foo]*7
-     assert_ene Reg[OB*(1..3)*(2..3)*2], [:foo]*3
-     assert_ene Reg[OB*(2..3)*(1..3)*2], [:foo]*3
-     assert_ene Reg[OB*(2..3)*(2..3)*(1..2)], [:foo]*3
-
-     assert_ene Reg[OB*(2..3)*(2..3)*2], [:foo]*7
-     assert_ene Reg[OB*(2..3)*(2..3)*(2..3)], [:foo]*7
-     assert_ene Reg[OB+2+2+2], [:foo]*7
-
-
-     assert_eee Reg[OB*(1..3)*(2..3)*2], [:foo]*4
-     assert_eee Reg[OB*2*1*2], [:foo]*4
-     assert_eee Reg[OB*1*(1..2)*2], [:foo]*2
-     assert_eee Reg[OB*2*(1..2)*1], [:foo]*2
-     assert_eee Reg[OB*1*(1..2)*2], [:foo]*3
-     assert_ene Reg[OB*2*(1..2)*1], [:foo]*3
-     assert_eee Reg[OB*1*(1..2)*2], [:foo]*4
-     assert_eee Reg[OB*2*(1..2)*1], [:foo]*4
-
-     a=[:foo]
-     x=(:foo.reg-1).mmatch a,0
-     assert x.next_match(a,0)==[[[:foo]],1]
-     assert x.next_match(a,0)==[[[]],0]
-     assert x.next_match(a,0)==nil
-
-     x=(:foo.reg-1).mmatch a,1
-     assert x==[[[]],0]
-
-     a=[:foo]
-     x=(:foo.reg-1-1).mmatch a,0
-     assert x.next_match(a,0)==[[[[:foo]]],1]
-
-
-
-     a=[:foo]*3
-     x=(:foo.reg*(1..2)).mmatch a,0
-     assert x.next_match(a,0)==[[[:foo]*2],2]
-     assert x.next_match(a,0)==[[[:foo]],1]
-     assert x.next_match(a,0)==nil
-
-     x=(:foo.reg*(1..2)).mmatch a,1
-     assert x.next_match(a,0)==[[[:foo]*2],2]
-     assert x.next_match(a,0)==[[[:foo]],1]
-     assert x.next_match(a,0)==nil
-
-     x=(:foo.reg*(1..2)).mmatch a,2
-     assert x==[[[:foo]],1]
-
-     x=(:foo.reg*(1..2)).mmatch a,3
-     assert x.nil?
-
-     x=(:foo.reg*(1..2)*(2..3)).mmatch a,0
-     assert x.next_match(a,0)==[[[[:foo]*2],[[:foo]]], 3]
-     assert x.instance_eval{@ri}==2
-     assert x.next_match(a,0)==[[[[:foo]],[[:foo]*2]], 3]
-     assert x.instance_eval{@ri}==2
-     assert x.next_match(a,0)==[[[[:foo]],[[:foo]],[[:foo]]], 3]
-     assert x.instance_eval{@ri}==3
-     assert x.next_match(a,0)==[[[[:foo]],[[:foo]]], 2]
-     assert x.instance_eval{@ri}==2
-     assert x.next_match(a,0)==nil
-
-     x=(:foo.reg*(1..2)*(2..3)).mmatch a,1
-     assert x.next_match(a,0)==[[[[:foo]],[[:foo]]], 2]
-     assert x.instance_eval{@ri}==2
-     assert x.next_match(a,0)==nil
-
-     x=(:foo.reg*(1..2)*(2..3)).mmatch a,2
-     assert x.nil?
-
-     x=(:foo.reg*(1..2)*(2..3)).mmatch a,3
-     assert x.nil?
-
-
-     assert((not (:foo.reg*(1..2)*(2..3)*(2..3)).mmatch [:foo]*3,0 ))
-
-
-
-     assert_ene Reg[:foo.reg*(1..2)*(2..3)*(2..3)], [:foo]*3
-     assert_eee Reg[:foo.reg*(1..2)*(2..3)*(2..3)], [:foo]*4
-     assert_ene Reg[OB*(1..2)*(2..3)*(2..3)], [:foo]*3
-     assert_eee Reg[OB*(1..2)*(2..3)*(2..3)], [:foo]*4
-     assert_ene Reg[OB*(1..2)*(2..3)+2], [:foo]*3
-     assert_eee Reg[OB*(1..2)*(2..3)+2], [:foo]*4
-     assert_ene Reg[OB*(1..2)+2+2], [:foo]*3
-     assert_eee Reg[OB*(1..2)+2+2], [:foo]*4
-     assert_ene Reg[OB+1+2+2], [:foo]*3
-     assert_eee Reg[OB+1+2+2], [:foo]*4
-
-     assert_eee Reg[5.reg+2+2], [5]*4
-     assert_eee Reg[5.reg*(1..2)*(1..2)*(1..2)], [5]
-     assert_eee Reg[5.reg*(1..2)*(1..2)*(2..3)], [5]*2
-     assert_eee Reg[5.reg*(1..2)*(2..3)*(2..3)], [5]*4
-     assert_eee Reg[(5.reg+1)*(2..3)*(2..3)], [5]*4
-     assert_eee Reg[(5.reg+1+2)*(2..3)], [5]*4
-     assert_eee Reg[5.reg+1+2+2], [5]*4
-     assert_eee Reg[OB+3+2], [:f]*6
-
-     assert_ene Reg[-[:foo,:bar]-1], [:bar,:foo]
-     assert_ene Reg[-[:foo,:bar]-1], [:baz,:foo,:bar]
-     assert_ene Reg[-[:foo,:bar]-1], [:foo,:bar,:baz]
-     assert_eee Reg[-[:foo,:bar]-1], [:foo,:bar]
-     assert_ene Reg[-[:foo,:bar]-1], [:foo]
-     assert_ene Reg[-[:foo,:bar]-1], [:bar]
-     assert_ene Reg[-[:foo,:bar]-1], [:baz]
-     assert_eee Reg[-[:foo,:bar]-1], []
-
-
-
-
-     assert_eee Reg[(-[-[:p]*(1..2)])], [:p]
-     assert_eee Reg[(-[-[:p]*(1..2)])], [:p,:p]
-     assert_ene Reg[(-[-[:p]*(1..2)])], [:p,:q]
-     assert_ene Reg[(-[-[:p]*(1..2)])], [:q]
-     assert_ene Reg[(-[-[:p]*(1..2)])], []
-     assert_ene Reg[(-[-[:p]*(1..2)])], [:p,:p, :p]
-
-
-     assert_eee Reg[OB+1], [:foo,:foo]
-     assert_eee Reg[OB+1+1], [:foo,:foo]
-     assert_eee Reg[OB+1+1+1], [:foo,:foo]
-     assert_eee Reg[OB+1+1+1+1], [:foo,:foo]
-
-     assert_ene Reg[OB+2+3], [:f]*5
-     assert_ene Reg[OB+2+2+1], [:f]*3
-
-     assert_eee Reg[lhqqbe+0], [
-      :begin, :popen, :"chomp!", :-@, :end, :q, :q,
-      :begin, :begin, :end, :end,
-      :begin, :MINOR_VERSION, :"public_method_defined?", :"\\", :begin, :umask,
-              :debug_print_help, :geteuid, :end,
-      :q, :public_methods, :option_name, :MUTEX, :q,
-      :begin, :verbose=, :binding, :symlink, :lambda,
-              :emacs_editing_mode, :"dst?", :end, 0,
-      :begin, :test_to_s_with_iv, :"\\", :begin, :glob, :each_with_index,
-              :initialize_copy, :begin, :$PROGRAM_NAME, :end,
-              :ELIBACC, :setruid, :"success?", :end,
-      :begin, :__size__, :width, :"\\", :begin, :$-a, :"sort!", :waitpid, :end,
-      :begin, :Stat, :WadlerExample, :chr, :end,
-      :begin, :+, :disable, :abstract,
-              :begin, :__size__, :"symlink?", :"dst?", :end, :ljust, :end,
-      :begin, :debug_method_info, :matchary, :"\\", :begin, :ftype,
-              :thread_list_all, :eof, :begin, :abs, :GroupQueue, :end,
-              :"slice!", :ordering=, :end,
-      :Q, :"\\", :Q, :ELIBMAX, :GetoptLong, :nlink, :Q,
-      :begin, :Fixnum, :waitall, :"enclosed?", :"\\", :begin, :deep_copy,
-              :getpgid, :strftime, :end,
-      :Q, :close_obj, :Q,
-      3, :basic_quote_characters=, :rmdir, :"writable_real?",
-      :begin, :test_hello_11_12, :utc_offset, :freeze,
-              :begin, :kcode, :egid=, :ARGF, :end,
-              :setuid, :lock, :gmtoff, :end,
-      :begin, :$FILENAME, :test_tree_alt_20_49,
-              :begin, :LOCK_SH, :EL3HLT, :end, :end,
-      :Q, :"\\", :Q, :ceil, :remainder, :group_sub, :Q, 0
-     ]
-
-if ($Slow||=nil)
-     #assert_eee Reg[OB+10+10], [:f]*100 #waaaay too slow
-     assert_eee Reg[OB+5+5], [:f]*25
-     assert_ene Reg[OB+5+5], [:f]*24
-     assert_eee Reg[OB+6+6], [:f]*36
-     assert_ene Reg[OB+6+6], [:f]*35
-     assert_eee Reg[OB+7+7], [:f]*49 #prolly excessive
-     assert_ene Reg[OB+7+7], [:f]*48 #prolly excessive
-end
-
-     assert_eee Reg[lhqqbe+0], [ :begin, :"\\", :rand, :end ]
- #breakpoint
-     assert_eee +[be], [:begin, :"\\", :"\\", :end]
-     assert_eee +[be], [:begin, :"\\", :begin, :end]
-     assert_eee +[be], [:begin, :"\\", :end, :end]
-     assert_eee +[be], [:begin, :log, :readline, :"\\", :begin, :lh_or_qq, :test_pretty_print_inspect, :@newline, :end]
-     assert_eee +[be], [:begin, :lock, :rindex, :begin, :sysopen, :rename, :end, :re_exchange, :on, :end]
-     assert_eee +[be], [:begin, :lock, :"\\", :"\\", :begin, :rename, :end, :on, :end]
-     assert_eee +[be], [:begin, :begin, :foo, :end, :end]
-     assert_eee +[be], makelendata(1,0b11110000000).flatten
-     assert_eee +[be], [:begin, :end]
-     assert_eee +[be], [:begin, :foo, :end]
-     assert_eee +[be], makelendata(1,0b10000000).flatten
-     assert_eee Reg[lhqqbe+0], makelendata(1,0b11111110011).flatten
-     assert_eee Reg[lhqqbe+0], makelendata(4,0b11111110011).flatten
-     assert_eee Reg[lhqqbe+0], makelendata(10,0b11111110011).flatten
-     assert_eee Reg[lhqqbe+0], makelendata(20,0b11111110011).flatten
-
-     assert_ene Reg[:foo,OB+1], [:foo]
-     assert_ene Reg[OB+1,:foo], [:foo]
-     assert_eee Reg[OB+1], [:foo]
-
-
-     assert_eee Reg[OB+1+1+1+1+1+1+1+1+1+1+1+1+1+1], [:foo]
-
-     assert_ene Reg[OB+1+1+1+1], []
-     assert_eee Reg[OB+1+1+1+1], [:foo,:foo]
-     assert_ene Reg[OB+2], [:foo]
-     assert_ene Reg[OB+2+2], [:foo]*3
-     assert_ene Reg[OB+2+2+1], [:foo]*3
-     assert_ene Reg[OB+2+1+2], [:foo]*3
-
-
-     assert_eee Reg[-[1,2]|3], [1,2]
-     assert_eee Reg[-[1,2]|3], [3]
-     assert_ene Reg[-[1,2]|3], [4]
-     assert_ene Reg[-[1,2]|3], [2]
-     assert_ene Reg[-[1,2]|3], [1,3]
-
-     assert_eee Reg[lenheadlist], [1, :__id__]
-     assert_eee Reg[(-[0]|-[1,OB]|-[2,OB*2])*1], [2, :p, :stat]
-     assert_eee Reg[(-[2,OB*2])-1], [2, :p, :stat]
-     assert_eee Reg[(-[OB])*(1..2)], [1, :p]
-
-     assert_eee Reg[(-[-[:p]*(1..2)])], [:p]
-     assert_eee Reg[(-[-[:p]])*(1..2)], [:p]
-     assert_eee Reg[(-[-[OB]])*(1..2)], [:p]
-     assert_eee Reg[(-[OB*1])*(1..2)], [:p]
-     assert_eee Reg[(-[1,OB*1])*(1..2)], [1, :p]
-     assert_eee Reg[(-[2,OB*2])*(1..2)], [2, :p, :stat]
-     assert_eee Reg[(-[0]|-[1,OB]|-[2,OB*2])*(1..2)], [2, :p, :stat]
-     assert_eee Reg[(-[0]|-[1,OB]|-[2,OB*2])+1], [2, :p, :stat]
-     assert_eee Reg[lenheadlist], [2, :p, :stat]
-     assert_eee Reg[lenheadlist], [2, :p, :stat, 1, :__id__]
-     assert_eee Reg[lenheadlist], [2, :p, :stat, 0, 1, :__id__, 0, 0]
-     assert_eee Reg[lenheadlist], lenheaddata
-     assert_ene Reg[lenheadlist], lenheaddataj
-     assert_eee +[lh_or_qq+0], lenheaddata
-     assert_eee +[lh_or_qq+0], lenheaddata+[:q, :foo, :bar, :baz, :q]
-
-     assert_eee Reg[lenheadlist], [0]
-     assert_eee Reg[lenheadlist], makelendata(1,0b11).flatten
-     assert_eee Reg[lenheadlist], makelendata(5,0b11).flatten
-     assert_eee Reg[lenheadlist], makelendata(10,0b11).flatten
-     assert_eee Reg[lenheadlist], makelendata(20,0b11).flatten
-     assert_ene Reg[lenheadlist], makelendata(20,0b11).flatten+[:j]
-     assert_ene Reg[lenheadlist], [:j]+makelendata(20,0b11).flatten+[:j]
-     assert_ene Reg[lenheadlist], [:j]+makelendata(20,0b11).flatten
-
-     assert_ene Reg[lenheadlist], makelendata(20,0b11,:j).flatten
-     assert_eee +[lh_or_qq+0], makelendata(20,0b11).flatten
-     assert_eee +[lh_or_qq+0], makelendata(20,0b1000011).flatten
-     assert_ene +[lh_or_qq+0], makelendata(20,0b1000011).flatten+[:j]
-     assert_ene +[lh_or_qq+0], [:j]+makelendata(20,0b1000011).flatten+[:j]
-     assert_ene +[lh_or_qq+0], [:j]+makelendata(20,0b1000011).flatten
-
-
-
-     t=(1..2)
-     assert_eee Reg[OB*t*t*t*t], [:foo]*16
-     assert_ene Reg[OB*t*t*t*t], [:foo]*17
-     assert_eee Reg[5.reg*t], [5]
-     assert_eee Reg[5.reg*t*1], [5]
-     assert_eee Reg[5.reg*1*t], [5]
-     assert_eee Reg[5.reg*t*t], [5]
-     assert_eee Reg[5.reg*t*t*t], [5]
-     assert_eee Reg[5.reg*t*t*t*t], [5]
-     assert_eee Reg[5.reg+1+1+1], [5]
-     assert_eee Reg[5.reg+1+1+1+1], [5]
-     assert_eee Reg[OB+1+1+1], [:foo]
-     assert_eee Reg[OB+1+1+1+1], [:foo]
-     assert_eee Reg[OB+2], [:foo]*2
-     assert_eee Reg[OB+2+2], [:foo]*4
-
-
-
-     #btracing monsters:
-     assert_eee Reg[OB*2], [:foo]*2
-     assert_eee Reg[OB*2*2], [:foo]*4
-     assert_eee Reg[OB*2*2*2*2], [:foo]*16
-     assert_eee Reg[OB*2*2*2*2*2*2*2*2], [:foo]*256
-     assert_eee Reg[OB-2-2-2-2-2-2-2-2], [:foo]*256
-
-
-
-     assert_ene Reg[OB-0], [1]
-     assert_eee Reg[OB+0], [1]
-     assert_eee Reg[OB-1], [1]
-     assert_eee Reg[OB+1], [1]
-     assert_eee Reg[OB-2], [1,2]
-     assert_eee Reg[OB+2], [1,2]
-
-     assert_eee Reg[OB], [1]
-     assert_eee Reg[OB*1], [1]
-     assert_eee Reg[OB*2], [1,2]
-     assert_eee Reg[OB*4], [1,2,3,4]
-
-     abcreg=Reg[OBS,:a,:b,:c,OBS]
-     assert_eee abcreg, [:a,:b,:c,7,8,9]
-     assert_eee abcreg, [1,2,3,:a,:b,:c,7,8,9]
-
-     assert_eee abcreg, [1,2,3,:a,:b,:c]
-     assert_eee abcreg, [:a,:b,:c]
-
-     assert_ene abcreg, [1,2,3,:a,:b,:d]
-     assert_ene abcreg, [1,2,3,:a,:d,:c]
-     assert_ene abcreg, [1,2,3,:d,:b,:c]
-
-     assert_ene abcreg, [1,2,3]
-     assert_ene abcreg, [1,2,3,:a]
-     assert_ene abcreg, [1,2,3,:a,:b]
-
-     assert_eee Reg[:a, OB+0, :b, :b, :b, :b, :b], [:a, 1,1,1,1,1,1, :b, :b, :b, :b, :b]
-     assert_eee Reg[:a, OB+0, :b, :b, :b, :b, :b], [:a, 1, :b, :b, :b, :b, :b]
-     assert_eee Reg[:a, OB+0, :b, :b, :b, :b, :b], [:a, :b, :b, :b, :b, :b]
-
-     assert_eee Reg[:a, OB+1, :b, :b, :b, :b, :b], [:a, 1,1,1,1,1,1, :b, :b, :b, :b, :b]
-     assert_eee Reg[:a, OB+1, :b, :b, :b, :b, :b], [:a, 1, :b, :b, :b, :b, :b]
-     assert_ene Reg[:a, OB+1, :b, :b, :b, :b, :b], [:a, :b, :b, :b, :b, :b]
-
-     assert_ene Reg[:a, OB-1, :b, :b, :b, :b, :b], [:a, 1,1,1,1,1,1, :b, :b, :b, :b, :b]
-     assert_eee Reg[:a, OB-1, :b, :b, :b, :b, :b], [:a, 1, :b, :b, :b, :b, :b]
-     assert_eee Reg[:a, OB-1, :b, :b, :b, :b, :b], [:a, :b, :b, :b, :b, :b]
-
-     assert_ene Reg[:a, OB-0, :b, :b, :b, :b, :b], [:a, 1,1,1,1,1,1, :b, :b, :b, :b, :b]
-     assert_ene Reg[:a, OB-0, :b, :b, :b, :b, :b], [:a, 1, :b, :b, :b, :b, :b]
-     assert_eee Reg[:a, OB-0, :b, :b, :b, :b, :b], [:a, :b, :b, :b, :b, :b]
-
-     assert_eee Reg[-[OB*2]], [99, 99]  #di not right in top level
-     assert_eee Reg[-[-[-[-[-[OB*2]]]]]], [99, 99]  #di not right in top level?
-     assert_eee Reg[-[-[-[-[-[OB*1]]]]]], [99]  #di not right in top level?
-     #RR[RR[[RR[RR[RR[RR[99,99]]]]]]]
-     assert_eee Reg[OB*1], [:foo]
-     assert_eee Reg[-[OB]], [88]
-     assert_ene Reg[-[0]], [88]
-     assert_eee Reg[-[0]], [0]
-     assert_eee Reg[-[OB*1]], [:foo]
-     assert_eee Reg[OB*1*1], [:foo]
-     assert_eee Reg[OB*1*1*1*1*1*1*1*1*1*1*1*1*1*1], [:foo]
-     assert_eee Reg[OB-1-1-1-1-1-1-1-1-1-1-1-1-1-1], [:foo]
-     assert_eee Reg[-[2,OB*2]], [2, 99, 99]
-
-     assert_eee RegMultiple, -[0]|-[1,2]
-     assert( (-[0]|-[1,2]).respond_to?( :mmatch))
-
-     assert_eee Reg[-[0],OBS], lenheaddataj
-     assert_eee Reg[-[0]|-[1,OB],OBS], lenheaddataj
-     assert_eee Reg[-[0]|-[1,OB]|-[2,OB*2],OBS], lenheaddataj
-     assert_eee Reg[-[0]|-[1,OB]|-[2,OB*2]|-[3,OB*3],OBS], lenheaddataj
-     assert_eee Reg[-[0]|-[1,OB]|-[2,OB*2]|-[3,OB*3]|-[4,OB*4],OBS], lenheaddataj
-
-
-
-     assert_eee Reg(:a=>:b), {:a=>:b}  #=> true
-     assert_ene Reg(:a=>:b), {:a=>:c}  #=> false
-     assert_ene Reg(:a=>:b), {}  #=> false
-     h={}
-     h.default=:b
-     assert_eee Reg(:a=>:b), h  #=> true
-
-     assert_eee Reg(/^(a|b)$/=>33), {"a"=>33}  #=> true
-     assert_eee Reg(/^(a|b)$/=>33), {"b"=>33}  #=> true
-     assert_ene Reg(/^(a|b)$/=>33), {"a"=>133}  #=> false
-     assert_ene Reg(/^(a|b)$/=>33), {"b"=>133}  #=> false
-
-     assert_ene Reg(/^(a|b)$/=>33), {"c"=>33}  #=> false
-
-     assert_eee Reg(/^(a|b)$/=>33), {"a"=>33,"b"=>33}  #=> true
-     assert_ene Reg(/^(a|b)$/=>33), {"a"=>33,"b"=>133}  #=> false
-     assert_ene Reg(/^(a|b)$/=>33), {"a"=>133,"b"=>33}  #=> false
-     assert_ene Reg(/^(a|b)$/=>33), {"a"=>133,"b"=>133}  #=> false
-
-
-     assert_eee Reg("a"=>33)|{"b"=>33}, {"a"=>33,"b"=>33}  #=> true
-     assert_eee Reg("a"=>33)|{"b"=>33}, {"a"=>33,"b"=>133}  #=> true
-     assert_ene Reg("a"=>33)|{"b"=>33}, {"a"=>133,"b"=>33}  #=> false
-     assert_ene Reg("a"=>33)|{"b"=>33}, {"a"=>133,"b"=>133}  #=> false
-
-     assert_eee Reg("a"=>33)|{"b"=>33}, {"b"=>33}  #=> true
-
-     assert_eee Reg(:a.reg|:b => 44), {:a => 44}  #=> true
-     assert_eee Reg(:a.reg|:b => 44), {:b => 44}  #=> true
-     assert_ene Reg(:a.reg|:b => 44), {:a => 144}  #=> false
-     assert_ene Reg(:a.reg|:b => 44), {:b => 144}  #=> false
-
-     print "\n"
-  end
-
-  def assert_eee(left,right,message='assert_eee failed')
-    assert(
-      left===right,
-      message+" left=#{left.inspect}  right=#{right.inspect}"
-    )
-    print ".";$stdout.flush
-  end
-
-  def assert_ene(left,right,message='assert_ene failed')
-    assert(
-     !(left===right),
-     message+" left=#{left.inspect}  right=#{right.inspect}"
-    )
-    print ",";$stdout.flush
-  end
-end
-end
-     srand;seed=srand
-
-     opts=GetoptLong.new(["--seed", "-s", GetoptLong::REQUIRED_ARGUMENT])
-     opts.each{|opt,arg|
-       opt=='--seed' or raise :impossible
-       seed=arg
-     }
-
-     print "random seed is #{seed}\n"
-     srand seed
-
-
-TC_Reg.test_reg
diff --git a/bundles/ruby.tmbundle/Tests/rubylexer/w.rb b/bundles/ruby.tmbundle/Tests/rubylexer/w.rb
deleted file mode 100644
index 56de46332..000000000
--- a/bundles/ruby.tmbundle/Tests/rubylexer/w.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-p %r{\/$}
-p %r~<!include:([\/\w\.\-]+)>~m
-
-p [].push *[1,2,3]
-p /\n/
-
-$a=1
-@b=2
-@@c=3
-p(/\#$a \#@b \#@@c \#{$a+@b+@@c}/)
-
-
-class Foo
-attr :foo,true
-end
-f=Foo.new
-p f.foo
-p f.foo=9
-p f.foo =19
-p f.foo= 29
-p f.foo = 39
-p f.foo
diff --git a/bundles/ruby.tmbundle/Tests/test1.rb b/bundles/ruby.tmbundle/Tests/test1.rb
deleted file mode 100644
index 98a0965ba..000000000
--- a/bundles/ruby.tmbundle/Tests/test1.rb
+++ /dev/null
@@ -1,302 +0,0 @@
-# Ruby syntax test file for stuff we've gotten wrong in the past or are currently getting wrong
-
-#########
-#basics
-
-module samwi_78se
-	
-	class mysuperclassofdoom < someotherclass
-
-	end
-end
-
-class gallo_way8 < kni9_ght
-  
-  def sl_9ay(beast)
-    
-  end
-
-  #These shouldn't capture the leading space before it
-  def my_method_of_doom(args)
-    'yay'
-  rescue
-    'whatever'
-  ensure
-    'something else'
-  end
-  
-  def my_method_of_doom(args);'yay';rescue;'whatever';ensure;'something else';end
-  
-  #The indent here should not be broken
-  
-end
-
-
-def hot?(cold)
-
-end
-
-def w00t!
-	
-	unless l33t
-		sysbeep
-	end
-	
-end
-
-###########
-# method names
-
-# method names can be keywords and should not be highlighted if they appear as explicit method invocations
-br = m.end(0) + b1
-x, y = b2vxay(m.begin(0) + b1)
-stream.next
-self.class
-
-
-# keyword.operator
-
-var1 ==  var2
-var1 === var2
-var1 =~  var2
-var1 =   var2
-var1 *   var2
-var1 -   var2
-var1 +   var2
-var1 %   var2
-var1 ^   var2
-var1 &   var2
-var1 *   var2
-
-# Method
-u.whatever +  'something'
-u.whatever + ('something')
-u.whatever +( 'something')
-u.whatever+   'something'
-u.whatever+  ('something')
-u.whatever+(  'something')
-
-u.whatever =  'something'
-u.whatever = ('something')
-u.whatever =( 'something')
-u.whatever=   'something'
-u.whatever=  ('something')
-u.whatever=(  'something')
-
-u.whatever =  12345
-u.whatever = (12345)
-u.whatever =( 12345)
-u.whatever=   12345
-u.whatever=  (12345)
-u.whatever=(  12345)
-u.whatever =12345
-u.whatever=12345
-
-u.whatever ==  'something'
-u.whatever == ('something')
-u.whatever ==( 'something')
-u.whatever==   'something'
-u.whatever==  ('something')
-u.whatever==(  'something')
-
-u.whatever ===  'something'
-u.whatever === ('something')
-u.whatever ===( 'something')
-u.whatever===   'something'
-u.whatever===  ('something')
-u.whatever===(  'something')
-
-u.password =  'something'
-u.password = ('something')
-u.password =( 'something')
-u.password=   'something'
-u.password=  ('something')
-u.password=(  'something')
-
-u.abort_on_exception =  'something'
-u.abort_on_exception = ('something')
-u.abort_on_exception =( 'something')
-u.abort_on_exception=   'something'
-u.abort_on_exception=  ('something')
-u.abort_on_exception=(  'something')
-
-u.success ?  'something'  :  'something else'
-u.success ? ('something') : ('something else')
-u.success ?( 'something') :( 'something else') #?( shouldn't be scoped as constant.numeric
-u.success?   'something'  :  'something else' 
-u.success?  ('something') : ('something else')
-u.success?(  'something') :( 'something else')
-
-# Function
-whatever =  'something'
-whatever = ('something')
-whatever =( 'something')
-whatever=   'something'
-whatever=  ('something')
-whatever=(  'something')
-
-password =  'something'
-password = ('something')
-password =( 'something')
-password=   'something'
-password=  ('something')
-password=(  'something')
-
-
-# this Totally kills Ruby Experimental ATM (Mon Jan 29 10:38:00 EST 2007)
-
-fred(  )fred()
-fred( ) fred()
-fred( ).fred()
-fred() .fred()
-fred.fred()
-
-# /kills
-
-# method calls no dot or round brackets
-puts "shmoo"
-foo {}
-foo bar
-
-# Regular Variables
-foo
-bar
-foo = 1
-foo = bar
-
-
-############
-# numbers
-
-data += 0.chr
-99.downto(0)
-
-0.9		# number
-0.A		# method invocation (0 -> A)
-0.A()	# method invocation (0 -> A)
-0xCAFEBABE022409ad802046	# hex
-23402	# integer
-4.232	# decimal
-
-
-###########
-# strings 
-
-'hello #{42} wor\'knjkld'		# no interpolation or escapes except for slash-single-quote
-
-# double quoted string (allows for interpolation):
-"hello #{42} world"	  #->  "hello 42 world"
-"hello #@ivar world"  #->  "hello 42 world"
-"hello #@@cvar world" #->  "hello 42 world"
-"hello #$gvar world"  #->  "hello 42 world"
-
-'hello #@ivar world'
-'hello #@@cvar world'
-'hello #$gvar world'
-
-# escapes
-"hello #$gvar \"world"  #->  "hello 42 \"world"
-
-# execute string (allows for interpolation):
-%x{ls #{dir}}	 #-> ".\n..\nREADME\nmain.rb"
-`ls #{dir}`   #-> ".\n..\nREADME\nmain.rb"
-
-%Q{dude #{hey}}
-%Q!dude#{hey}!
-%W(dude#{hey})
-%q!dude#{hey}!
-%s{dude#{hey}}
-%w{dude#{hey}}
-%{woah#{hey}}
-% woah#{hey} 
-
-# mod operator should not be interpreted as a string operator
-# (space as delimiter is legal Ruby: '% string ' => "string")
-if (data.size % 2) == 1
-line << ('%3s ' % str)
-
-
-###########
-# regexp
-
-/matchmecaseinsensitive/i
-/matchme/
-/ matchme /
-%r{matchme}
-
-32/23	#division, not regexp
-
-32 / 32 #division, not regexp
-
-gsub!(/ +/, '')  #regexp, not division
-
-###########
-# symbols
-
-:BIG  :aBC	:AbC9  :symb  :_asd	 :_9sd	:__=  :f00bar  :abc!
-			:abc?  :abc=  :<<  :<  :>>	:>	:<=>  :<=  :>=	:%	:*	:**
-			:+	:-	:&	:|	:~	:=~	 :==  :===	:`	:[]=  :[]  :/  :-@
-			:+@	 :@aaa	:@@bbb
-
-# else clause of ternary logic should not highlight as symbol
-val?(a):p(b)
-val?'a':'b'
-M[1]?(a+b):p(c+d)
-
-val ? (a) : p(b)
-val ? 'a' : 'b'
-M[1] ? (a+b) : p(c+d)
-
-# but we must also account for ? in method names
-thing.fred?(:someone)
-thing.fred? :someone
-thing.fred? thing2, :someone
-
-begin = {"(?=\\w)\\s*\\?:"}
-
-
-############
-#literal capable of interpolation:	 
-%W(a b#{42}c) #-> ["a", "b42c"]
-%W(ab c\nd \\\)ef)
-
-%(#{42})  #->  "42"
-
-
-############
-# multiline comments
-
-=begin
-stuff here
-... def must_not_highlight_keywords_in_comments end;
-stuff here too
-=end
-
-
-############
-#literal incapable of interpolation
-%w(a b#{42}c) 					#-> ["a", "b#{42}c"]############
-%w(ab c\nd \\\)ef)				# heredoc tests
-
-append << not_heredoc
-
-heredoc = <<END # C heredoc
-
-void LoveMyCarpet( int forReal )
-{
-	forReal = 56;
-}
-
-END
-
-assert_equal(2**i, 1<<i)
-
-
-##########
-# end marker
-
-__END__
-
-def nothing_here_should_be_highlighted!( at all )
-
-end
diff --git a/bundles/ruby.tmbundle/info.plist b/bundles/ruby.tmbundle/info.plist
deleted file mode 100644
index beaab5a26..000000000
--- a/bundles/ruby.tmbundle/info.plist
+++ /dev/null
@@ -1,636 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>contactEmailRot13</key>
-	<string>wnzrf@tenlcebqhpgvbaf.arg</string>
-	<key>contactName</key>
-	<string>James Edward Gray II</string>
-	<key>deleted</key>
-	<array>
-		<string>3988A501-119E-4C0E-A584-C5E75FC2D6C6</string>
-		<string>8C102BE9-6E49-11D9-A933-000D93589AF6</string>
-		<string>EE5F1AE5-6C02-11D9-92BA-0011242E4184</string>
-		<string>8394EDEF-87E8-11D9-A6A3-000D93589AF6</string>
-		<string>BE3B3E5E-733E-11D9-A833-000A95A89C98</string>
-		<string>66708792-62C3-11D9-B8CF-000D93589AF6</string>
-		<string>667089D2-62C3-11D9-B8CF-000D93589AF6</string>
-		<string>667080D9-62C3-11D9-B8CF-000D93589AF6</string>
-		<string>667081DE-62C3-11D9-B8CF-000D93589AF6</string>
-		<string>66708259-62C3-11D9-B8CF-000D93589AF6</string>
-		<string>66708052-62C3-11D9-B8CF-000D93589AF6</string>
-		<string>6670881E-62C3-11D9-B8CF-000D93589AF6</string>
-		<string>7990EE60-C850-4779-A8C0-7FD2C853B99B</string>
-	</array>
-	<key>description</key>
-	<string>Support for the &lt;a href="http://www.ruby-lang.org/"&gt;Ruby&lt;/a&gt; programming language.</string>
-	<key>mainMenu</key>
-	<dict>
-		<key>excludedItems</key>
-		<array>
-			<string>E5158F94-CC52-4424-A495-14EF9272653F</string>
-			<string>EEE6D060-C5A0-400D-A2E0-0835013C5365</string>
-			<string>76FCF165-54CB-4213-BC55-BD60B9C6A3EC</string>
-			<string>6519CB08-8326-4B77-A251-54722FFBFC1F</string>
-			<string>835FAAC6-5431-436C-998B-241F7226B99B</string>
-			<string>A83F68A9-F751-4BB4-AE16-56812878C16A</string>
-			<string>47D203ED-EB9B-4653-A07B-A897800CEB76</string>
-		</array>
-		<key>items</key>
-		<array>
-			<string>35222962-C50D-4D58-A6AE-71E7AD980BE4</string>
-			<string>5289EE40-86B8-11D9-A8D4-000A95E13C98</string>
-			<string>------------------------------------</string>
-			<string>63F3B3B7-CBE2-426B-B551-657733F3868B</string>
-			<string>6EA7AE06-3EA9-497D-A6DE-732DE43DA6E9</string>
-			<string>------------------------------------</string>
-			<string>8646378E-91F5-4771-AC7C-43FC49A93576</string>
-			<string>EE5F19BA-6C02-11D9-92BA-0011242E4184</string>
-			<string>------------------------------------</string>
-			<string>EE5F1FB2-6C02-11D9-92BA-0011242E4184</string>
-			<string>FBFC214F-B019-4967-95D2-028F374A3221</string>
-			<string>88BC3896-DC39-4307-A271-21D33340F15A</string>
-			<string>------------------------------------</string>
-			<string>9FB64639-F776-499B-BA6F-BB45F86F80FD</string>
-			<string>7F79BC8D-8A4F-4570-973B-05DFEC25747F</string>
-			<string>B297E4B8-A8FF-49CE-B9C4-6D4911724D43</string>
-			<string>FDFABCB9-DF58-4469-AE11-5407A4FF4D70</string>
-			<string>------------------------------------</string>
-			<string>A1433C73-A475-4B9F-8B46-E182C588ED7D</string>
-			<string>D52AE6E7-DB75-46C9-94B0-F90B186BE1B2</string>
-			<string>B32BD8CF-903E-42D9-B1D3-44F88F262134</string>
-			<string>F120CD22-35C0-4E41-8F12-E3C41E04DAB3</string>
-			<string>A2A5E4B3-D9C6-4C49-B4CB-8090D615485E</string>
-			<string>D94AD09E-ADF4-47C9-8236-C7B38B44804E</string>
-			<string>803A6BDF-D74A-4B69-AFF0-98B824AB478D</string>
-			<string>2765038A-1CFC-4BBD-B19C-6EB2B400D528</string>
-			<string>C03F02B1-8BE3-49F5-B983-48C1BDE2657C</string>
-		</array>
-		<key>submenus</key>
-		<dict>
-			<key>1BE427C6-0071-4BFF-8CDA-1DC13534E7D8</key>
-			<dict>
-				<key>items</key>
-				<array>
-					<string>931DD73E-615E-476E-9B0D-8341023AE730</string>
-					<string>DAA69A0C-FC1E-4509-9931-DFFB38B4D6AE</string>
-					<string>2DDB6FE0-6111-4C40-A149-8E67E76F8272</string>
-				</array>
-				<key>name</key>
-				<string>Format</string>
-			</dict>
-			<key>2765038A-1CFC-4BBD-B19C-6EB2B400D528</key>
-			<dict>
-				<key>items</key>
-				<array>
-					<string>2DBEE50B-3097-4A57-AB48-3586CF392D8B</string>
-					<string>0BA2B2F1-E767-4A03-9791-0AC0183251F1</string>
-					<string>B46D35B8-5DEB-4C10-A110-BA1965A2EB9C</string>
-					<string>97054C4D-E4A3-45B1-9C00-B82DBCB30CAD</string>
-				</array>
-				<key>name</key>
-				<string>Idioms</string>
-			</dict>
-			<key>33312F8F-A75F-49E5-AC1B-B65944C1309C</key>
-			<dict>
-				<key>items</key>
-				<array>
-					<string>8021944C-CEA4-4983-8D1C-78D18D4004A1</string>
-					<string>2514FC26-468C-4D08-A788-494A444C4286</string>
-					<string>------------------------------------</string>
-					<string>66802933-B49F-479B-9DF9-1D898FF1FA90</string>
-				</array>
-				<key>name</key>
-				<string>Strings</string>
-			</dict>
-			<key>42D15F0C-0A45-4580-944E-20229EB8C92E</key>
-			<dict>
-				<key>items</key>
-				<array>
-					<string>9E0B4D4B-2956-4B3A-800A-3D8CE54E66BF</string>
-					<string>BA9440C9-36C3-4031-BB61-67B581D5B179</string>
-					<string>------------------------------------</string>
-					<string>B0CE57EC-FB2E-4482-8CCE-448DC2588715</string>
-				</array>
-				<key>name</key>
-				<string>Ordering</string>
-			</dict>
-			<key>607DFBB6-D4BD-46B1-A221-698CC657143B</key>
-			<dict>
-				<key>items</key>
-				<array>
-					<string>DAE6A754-D906-4763-B816-CE67125CEF08</string>
-					<string>------------------------------------</string>
-					<string>263C94DC-63CF-4BA3-9692-C5582CA8F1AB</string>
-					<string>6021BBDC-4AAD-447B-A0C2-A4BB31721558</string>
-					<string>3DDB99C4-486D-4C11-A217-5680FDD8EC19</string>
-					<string>FD010022-E0E7-44DB-827F-33F7D9310DA2</string>
-				</array>
-				<key>name</key>
-				<string>Arrays</string>
-			</dict>
-			<key>6EA7AE06-3EA9-497D-A6DE-732DE43DA6E9</key>
-			<dict>
-				<key>items</key>
-				<array>
-					<string>1AD6A138-2E89-4D6A-AB3F-416BF9CE968D</string>
-					<string>------------------------------------</string>
-					<string>1BE427C6-0071-4BFF-8CDA-1DC13534E7D8</string>
-					<string>------------------------------------</string>
-					<string>05984208-D559-4C04-A69C-2019361A985A</string>
-					<string>BF4CA9F1-51CD-48D4-8357-852234F59046</string>
-					<string>------------------------------------</string>
-					<string>ED6368FB-A11D-4622-9F42-7879481094F1</string>
-				</array>
-				<key>name</key>
-				<string>RDoc</string>
-			</dict>
-			<key>803A6BDF-D74A-4B69-AFF0-98B824AB478D</key>
-			<dict>
-				<key>items</key>
-				<array>
-					<string>0CB48BCA-3F6E-4AE0-85BC-08A1D2508216</string>
-					<string>20AAD0BC-075D-4EC0-9057-E3E5E62C4125</string>
-					<string>------------------------------------</string>
-					<string>5AE7CFB4-418E-4E00-AD76-06DB755EE876</string>
-					<string>5B46ECFD-23A4-4F0C-9951-F64C19C72C2B</string>
-					<string>46BF99AD-E172-4D49-BCF7-072F4730E1D9</string>
-					<string>------------------------------------</string>
-					<string>9460392B-C036-4A76-A5AE-1191F10E4B1B</string>
-					<string>3BA6762A-BB6B-489E-8006-F30F386AEF48</string>
-					<string>2C07D4E7-D74F-4AE4-82BE-B0BA82247AFA</string>
-					<string>8343ACF4-EEB7-44B5-B835-94826466D4D5</string>
-					<string>------------------------------------</string>
-					<string>F6BF907E-FDF7-4D9B-9E57-BE159561349D</string>
-					<string>B904D4AA-D15D-48A4-8EB2-563BAF489332</string>
-					<string>CC300D44-6C3F-4F6C-A8AB-86F5A2DC57CF</string>
-				</array>
-				<key>name</key>
-				<string>Serialization</string>
-			</dict>
-			<key>8D131E43-1245-410B-A7D8-E00222CE5412</key>
-			<dict>
-				<key>items</key>
-				<array>
-					<string>07D1F987-7CDB-4EAD-B64A-27A93051700E</string>
-					<string>A3B9B76B-2BC5-425C-AB24-9FAAFC375798</string>
-					<string>5DA9E1E8-2C54-420A-9B84-B040A1AF2B9E</string>
-					<string>669A86AD-936F-4EDA-8E4E-6863804072DA</string>
-					<string>6C6B9849-9631-49FF-A9F9-F0E94A1512C5</string>
-					<string>1F72122A-35AD-4BA1-AA01-889A10319666</string>
-					<string>E23FE534-8061-4828-98A5-46270B6910B0</string>
-					<string>197709C5-8382-4A59-B6D7-31A0CC0F23B7</string>
-					<string>9D9E7BA3-8C5D-4532-83EA-326358C2F5BB</string>
-					<string>98182B9E-7C61-4824-BE4C-9CD69C816037</string>
-					<string>CB03D11A-7204-48D0-92C1-E109034403E7</string>
-					<string>52B8BF63-F09E-4789-8407-06168A8AE666</string>
-					<string>B79B9DAB-ABEF-44F6-BF7E-635E7BA11DFD</string>
-					<string>4E409AA4-E7D4-46B7-A4E9-E32F992B33E9</string>
-				</array>
-				<key>name</key>
-				<string>Searching and Selection</string>
-			</dict>
-			<key>9E56B46B-80D0-4397-91B1-E5BEF5FF2811</key>
-			<dict>
-				<key>items</key>
-				<array>
-					<string>ECBA4CA0-275F-460E-85BE-E82FEA2E2B26</string>
-					<string>338EC03D-3FF4-4435-94E8-1CEF20CEC75D</string>
-					<string>7E084412-80E6-4B70-8092-C03D1ECE4CD2</string>
-					<string>FDD73070-6D32-4301-A86A-C55B77C3D8ED</string>
-					<string>EC73D5CC-5F05-46B9-A6F4-82037E4A38C9</string>
-					<string>3C04589C-5127-478E-97B3-CA7DD2EA7ECD</string>
-					<string>689120C9-AB40-4081-8268-9362E00FA4A0</string>
-					<string>E54F7077-3C33-4B53-A4F7-21E16132D3AD</string>
-					<string>02913388-EE8E-4C55-AC94-94F3D751F47E</string>
-					<string>7A3CECED-452B-438E-A5C6-95B6BDC43243</string>
-					<string>825B721D-4367-4DF7-98C0-F005695DF9E3</string>
-					<string>CD748479-D2A4-4AB5-95BD-4C89512BA210</string>
-					<string>844DBD70-BC23-4FBF-9C18-F4A610239DF2</string>
-					<string>1DD13CF5-39C0-4F10-B655-56DACEBC7F94</string>
-					<string>F3C5F719-EF03-4FF7-A777-4A8402FE3B6B</string>
-					<string>------------------------------------</string>
-					<string>B563E0D7-513D-49B4-9733-1B04A6F25A74</string>
-					<string>------------------------------------</string>
-					<string>5A3754FC-43A3-462B-AB42-E3E951872E6F</string>
-					<string>BFB65D1C-62F1-485D-8A67-3E5A2E55107C</string>
-					<string>BD4CFD7B-1AC0-4569-9BDA-FD491F41F4E6</string>
-				</array>
-				<key>name</key>
-				<string>Each Element</string>
-			</dict>
-			<key>A1433C73-A475-4B9F-8B46-E182C588ED7D</key>
-			<dict>
-				<key>items</key>
-				<array>
-					<string>0275EF39-9357-408F-AF20-79E415CA9504</string>
-					<string>------------------------------------</string>
-					<string>0F940CBC-2173-49FF-B6FD-98A62863F8F2</string>
-					<string>667083EE-62C3-11D9-B8CF-000D93589AF6</string>
-					<string>48D8E498-C9A5-4B1B-9A18-71A5860276FB</string>
-					<string>4E9A7A73-875C-11D9-897C-000393CBCE2E</string>
-					<string>6670835F-62C3-11D9-B8CF-000D93589AF6</string>
-					<string>667082E6-62C3-11D9-B8CF-000D93589AF6</string>
-					<string>CD1609FA-47DA-4EE4-9C5B-5C56D953F5B1</string>
-					<string>F53E098D-D08E-4CE2-990A-B0BD70E60614</string>
-					<string>D121FC61-96A4-4B8F-8709-280EDA876FF3</string>
-					<string>488B387C-50C0-4B2D-9260-5A7E7EAF9B42</string>
-					<string>------------------------------------</string>
-					<string>E7A3BCF6-3594-453A-945D-4C5D81631CBF</string>
-					<string>B37B0E21-1B49-494A-BA56-367CF18DD0B2</string>
-					<string>451A0596-1F72-4AFB-AF2F-45900FABB0F7</string>
-					<string>------------------------------------</string>
-					<string>A05CBDD6-845D-45EB-94FB-F8787F5456BE</string>
-					<string>B2C3ADE8-E19E-4B87-9C6C-593D490114C7</string>
-					<string>97DE939B-D243-4D5C-B953-1C9090912E7C</string>
-					<string>33969819-62C5-4E03-B824-C2337205F364</string>
-					<string>34FEBB9F-73CD-4DD4-A0A3-1CF2A5E3DE78</string>
-					<string>E16D24D2-CC7E-4786-BE0B-1725FC865D78</string>
-					<string>21C0D711-F32A-4665-AA0D-B136F9DD3945</string>
-					<string>49D69DEC-6991-49F4-8D9B-BA60BFDD3D17</string>
-				</array>
-				<key>name</key>
-				<string>Declarations</string>
-			</dict>
-			<key>A2A5E4B3-D9C6-4C49-B4CB-8090D615485E</key>
-			<dict>
-				<key>items</key>
-				<array>
-					<string>418F1817-255F-430A-B09A-222964ED66A7</string>
-					<string>------------------------------------</string>
-					<string>8F594E5E-6F46-4E98-B5FB-1C8F3BA9828F</string>
-					<string>50C56AC8-48F3-42A0-AF10-8164464AFAEF</string>
-					<string>397FA09F-A30F-4EE4-920C-318D5004EE97</string>
-					<string>------------------------------------</string>
-					<string>332AA973-AA71-48CB-AEE9-1D71E11019AC</string>
-					<string>8EBBB26F-980E-404E-8366-74E5772298F6</string>
-					<string>678BDB83-FBBD-4E8E-BE0B-E1A98AECB247</string>
-					<string>A4E89D97-D5ED-48BB-B5FF-1BFB79211FCD</string>
-					<string>------------------------------------</string>
-					<string>8CEF9711-88D5-4202-AFB9-29EF4EFD25C1</string>
-					<string>C3C48948-4F49-484E-A8DE-DEB44723099E</string>
-					<string>209D5D73-7A77-4931-A158-3FB6D5B48A88</string>
-				</array>
-				<key>name</key>
-				<string>Files</string>
-			</dict>
-			<key>A2F24A2E-6791-4005-8E32-5D436AB075DB</key>
-			<dict>
-				<key>items</key>
-				<array>
-					<string>4991BB86-736E-4758-B9B2-E4FA90B9368F</string>
-					<string>36853A11-0307-4AE7-B835-7CE6358717A5</string>
-					<string>206D54AF-E67A-4DF0-B7F4-3D42FEB81685</string>
-					<string>51954118-81D7-42B6-9A10-BE23D8B9FFE2</string>
-					<string>------------------------------------</string>
-					<string>567E3D18-BF2B-4379-8927-2777EC9F495E</string>
-				</array>
-				<key>name</key>
-				<string>Counting</string>
-			</dict>
-			<key>B32BD8CF-903E-42D9-B1D3-44F88F262134</key>
-			<dict>
-				<key>items</key>
-				<array>
-					<string>59E811FF-E722-46BE-8938-04713612FABB</string>
-					<string>------------------------------------</string>
-					<string>855FC4EF-7B1E-48EE-AD4E-5ECB8ED79D1C</string>
-					<string>4B72C5C3-6CA7-41AC-B2F9-51DEA25D469E</string>
-					<string>------------------------------------</string>
-					<string>21E75321-0CF7-45E8-A297-BCC7C0DDDD15</string>
-				</array>
-				<key>name</key>
-				<string>Blocks</string>
-			</dict>
-			<key>B37B0E21-1B49-494A-BA56-367CF18DD0B2</key>
-			<dict>
-				<key>items</key>
-				<array>
-					<string>A150C2D8-25B3-4339-BC92-8A0160A70486</string>
-					<string>3D383096-A03F-4EF8-9060-3C727045AB34</string>
-					<string>D7A7D3C9-1714-4C50-8CC0-D83A03883E8F</string>
-					<string>------------------------------------</string>
-					<string>AAD5D511-6BE7-41DA-8F2B-1593A48FBB08</string>
-					<string>6C9D6B3D-D8E9-4606-9534-577C8D21FFF6</string>
-					<string>------------------------------------</string>
-					<string>58FDEA60-10AF-4C49-AA09-29B77030DB25</string>
-					<string>7F46C90A-595B-4B83-A4F7-058F63CE4218</string>
-					<string>------------------------------------</string>
-					<string>7C6E88FA-CA0E-4110-8C75-A94E54286A75</string>
-					<string>4E9D15B5-65D6-4A9A-9DEC-DE041D68C06F</string>
-					<string>87D5F8AD-8DA6-4AED-A0D8-B51CAC980445</string>
-					<string>C44ED391-614F-4BA2-BB0F-87668EEA9954</string>
-					<string>4A6EFD6B-88E2-4822-AD48-03460EDBC796</string>
-					<string>------------------------------------</string>
-					<string>988C8AEF-FC71-4455-9C4F-9338C05685A4</string>
-					<string>------------------------------------</string>
-					<string>7BC1E159-0C90-4B0D-8808-80165C11F59C</string>
-				</array>
-				<key>name</key>
-				<string>Methods</string>
-			</dict>
-			<key>C03F02B1-8BE3-49F5-B983-48C1BDE2657C</key>
-			<dict>
-				<key>items</key>
-				<array>
-					<string>569C9822-8C41-4907-94C7-1A8A0031B66D</string>
-					<string>------------------------------------</string>
-					<string>05EE1046-5ED7-48F5-8693-1F066163B2F4</string>
-					<string>A7BF14E6-59B1-42E5-8755-8A72BF13685E</string>
-				</array>
-				<key>name</key>
-				<string>Rake</string>
-			</dict>
-			<key>D52AE6E7-DB75-46C9-94B0-F90B186BE1B2</key>
-			<dict>
-				<key>items</key>
-				<array>
-					<string>607DFBB6-D4BD-46B1-A221-698CC657143B</string>
-					<string>A2F24A2E-6791-4005-8E32-5D436AB075DB</string>
-					<string>9E56B46B-80D0-4397-91B1-E5BEF5FF2811</string>
-					<string>42D15F0C-0A45-4580-944E-20229EB8C92E</string>
-					<string>8D131E43-1245-410B-A7D8-E00222CE5412</string>
-					<string>33312F8F-A75F-49E5-AC1B-B65944C1309C</string>
-				</array>
-				<key>name</key>
-				<string>Iterators</string>
-			</dict>
-			<key>D94AD09E-ADF4-47C9-8236-C7B38B44804E</key>
-			<dict>
-				<key>items</key>
-				<array>
-					<string>31D1F145-33AB-4441-BA11-4D1C46928C4C</string>
-					<string>00F66D41-25AF-4597-B67D-E540965A5222</string>
-					<string>5297FD0C-98B1-4514-BBD1-1516810BECA6</string>
-					<string>------------------------------------</string>
-					<string>B32C147D-44A6-478A-9D5D-189D7831E9A7</string>
-					<string>43A61A22-6BEE-4997-961C-1CDE739C05FE</string>
-					<string>A243E96F-DC21-4AA0-B340-13A7674F6AFF</string>
-					<string>429D0EF5-580D-4166-8F79-713DE96B77F1</string>
-					<string>0E831E03-67E1-4357-8323-C60685C23C4F</string>
-					<string>671F05E2-D9CC-485E-BB1B-B13EF20FAC65</string>
-					<string>4C79256C-480A-459C-BDE8-BB0D972811DB</string>
-					<string>79FEC3CC-2A40-4611-9A85-ECDB22FE0701</string>
-					<string>711ED6C3-0F18-41FB-9A7D-3094BB319A85</string>
-					<string>A072BB1E-1DD1-45D3-9346-8CA3BA21B364</string>
-					<string>1B925A4D-8EE4-442B-9254-293599F5717F</string>
-					<string>68B21F6F-5D89-41FA-A19C-F29C2F912B4E</string>
-					<string>82F8EEE0-2452-411E-8102-7BFDDBCA2E72</string>
-					<string>09A11FDA-49FC-4466-8787-8D1D5D111A89</string>
-					<string>29340695-E426-4F77-8CF7-C59360A549F4</string>
-					<string>F91C25EC-EC76-498B-BFB5-FDA8F57C5875</string>
-					<string>7850AD5C-A90D-4E2C-A931-EADFF8D3D9A3</string>
-					<string>05655BD8-23C6-445F-BFD1-420BF25C3030</string>
-					<string>33639D7A-BD8C-4396-9C44-307B8AC87C9E</string>
-					<string>------------------------------------</string>
-					<string>DB457094-1AC9-4856-AEFC-43A9576B6775</string>
-					<string>B186BAC0-D981-41AC-B8F4-34BAD2BC4EE6</string>
-					<string>F46A4687-E52D-40D2-9072-C215645EDBC6</string>
-					<string>------------------------------------</string>
-					<string>C649F945-DAB8-4DA2-B73C-2EFF9D7D34F3</string>
-					<string>942F20E2-C40A-44B8-A3F2-99AAC68CB534</string>
-					<string>1C60D589-DD46-4109-90CA-6B34AEA2F298</string>
-				</array>
-				<key>name</key>
-				<string>Tests</string>
-			</dict>
-			<key>E7A3BCF6-3594-453A-945D-4C5D81631CBF</key>
-			<dict>
-				<key>items</key>
-				<array>
-					<string>BF487539-8085-4FF4-8601-1AD20FABAEDC</string>
-					<string>83EED068-8C1C-4BAF-9893-902DC00616AB</string>
-					<string>0CCBE04E-F4E2-4E55-9506-7DE67ACF8388</string>
-					<string>05DFF82C-5A29-4EBD-93FE-C165FFFB5EA8</string>
-					<string>E98FB8F9-7302-431D-8BF2-275A68A6126C</string>
-					<string>121B334B-2AA6-4E9A-A8B8-BF93B627982B</string>
-					<string>AFE1D078-EA16-45F5-AD8A-FAC1B523D861</string>
-					<string>C7AAAE45-487A-4B61-8962-D47675AAC05F</string>
-					<string>------------------------------------</string>
-					<string>2B73EC5F-06D2-460C-A14F-6FA05AFCF0CC</string>
-					<string>0E85EC81-2FAB-4648-B590-119CC1BB6E41</string>
-					<string>A71A18CF-2D71-4BFF-AA0C-D9B8C59BC4EB</string>
-				</array>
-				<key>name</key>
-				<string>Classes and Modules</string>
-			</dict>
-			<key>F120CD22-35C0-4E41-8F12-E3C41E04DAB3</key>
-			<dict>
-				<key>items</key>
-				<array>
-					<string>E16EE658-1CA0-4950-954B-B962E50B754F</string>
-					<string>------------------------------------</string>
-					<string>840B9C4C-7037-4C3B-9028-EB9DC75EDB3E</string>
-					<string>B9E3A6DF-875D-11D9-897C-000393CBCE2E</string>
-					<string>------------------------------------</string>
-					<string>F4EEB2B6-07D8-402F-8FC3-79B7308D2576</string>
-				</array>
-				<key>name</key>
-				<string>Hashes</string>
-			</dict>
-		</dict>
-	</dict>
-	<key>name</key>
-	<string>Ruby</string>
-	<key>ordering</key>
-	<array>
-		<string>35222962-C50D-4D58-A6AE-71E7AD980BE4</string>
-		<string>5289EE40-86B8-11D9-A8D4-000A95E13C98</string>
-		<string>63F3B3B7-CBE2-426B-B551-657733F3868B</string>
-		<string>1AD6A138-2E89-4D6A-AB3F-416BF9CE968D</string>
-		<string>931DD73E-615E-476E-9B0D-8341023AE730</string>
-		<string>DAA69A0C-FC1E-4509-9931-DFFB38B4D6AE</string>
-		<string>2DDB6FE0-6111-4C40-A149-8E67E76F8272</string>
-		<string>BF4CA9F1-51CD-48D4-8357-852234F59046</string>
-		<string>8646378E-91F5-4771-AC7C-43FC49A93576</string>
-		<string>EE5F19BA-6C02-11D9-92BA-0011242E4184</string>
-		<string>76FCF165-54CB-4213-BC55-BD60B9C6A3EC</string>
-		<string>EE5F1FB2-6C02-11D9-92BA-0011242E4184</string>
-		<string>FBFC214F-B019-4967-95D2-028F374A3221</string>
-		<string>9FB64639-F776-499B-BA6F-BB45F86F80FD</string>
-		<string>7F79BC8D-8A4F-4570-973B-05DFEC25747F</string>
-		<string>B297E4B8-A8FF-49CE-B9C4-6D4911724D43</string>
-		<string>835FAAC6-5431-436C-998B-241F7226B99B</string>
-		<string>0275EF39-9357-408F-AF20-79E415CA9504</string>
-		<string>59E811FF-E722-46BE-8938-04713612FABB</string>
-		<string>F4EEB2B6-07D8-402F-8FC3-79B7308D2576</string>
-		<string>97054C4D-E4A3-45B1-9C00-B82DBCB30CAD</string>
-		<string>569C9822-8C41-4907-94C7-1A8A0031B66D</string>
-		<string>6519CB08-8326-4B77-A251-54722FFBFC1F</string>
-		<string>47D203ED-EB9B-4653-A07B-A897800CEB76</string>
-		<string>C122CD92-DDBE-4869-9C7A-CC2B254C9411</string>
-		<string>121B334B-2AA6-4E9A-A8B8-BF93B627982B</string>
-		<string>58FDEA60-10AF-4C49-AA09-29B77030DB25</string>
-		<string>33969819-62C5-4E03-B824-C2337205F364</string>
-		<string>7E084412-80E6-4B70-8092-C03D1ECE4CD2</string>
-		<string>EC73D5CC-5F05-46B9-A6F4-82037E4A38C9</string>
-		<string>825B721D-4367-4DF7-98C0-F005695DF9E3</string>
-		<string>BFB65D1C-62F1-485D-8A67-3E5A2E55107C</string>
-		<string>C649F945-DAB8-4DA2-B73C-2EFF9D7D34F3</string>
-		<string>5AE7CFB4-418E-4E00-AD76-06DB755EE876</string>
-		<string>9460392B-C036-4A76-A5AE-1191F10E4B1B</string>
-		<string>2C07D4E7-D74F-4AE4-82BE-B0BA82247AFA</string>
-		<string>F6BF907E-FDF7-4D9B-9E57-BE159561349D</string>
-		<string>E5158F94-CC52-4424-A495-14EF9272653F</string>
-		<string>A83F68A9-F751-4BB4-AE16-56812878C16A</string>
-		<string>05984208-D559-4C04-A69C-2019361A985A</string>
-		<string>ED6368FB-A11D-4622-9F42-7879481094F1</string>
-		<string>88BC3896-DC39-4307-A271-21D33340F15A</string>
-		<string>FDFABCB9-DF58-4469-AE11-5407A4FF4D70</string>
-		<string>0F940CBC-2173-49FF-B6FD-98A62863F8F2</string>
-		<string>667083EE-62C3-11D9-B8CF-000D93589AF6</string>
-		<string>48D8E498-C9A5-4B1B-9A18-71A5860276FB</string>
-		<string>4E9A7A73-875C-11D9-897C-000393CBCE2E</string>
-		<string>7BC1E159-0C90-4B0D-8808-80165C11F59C</string>
-		<string>6670835F-62C3-11D9-B8CF-000D93589AF6</string>
-		<string>667082E6-62C3-11D9-B8CF-000D93589AF6</string>
-		<string>CD1609FA-47DA-4EE4-9C5B-5C56D953F5B1</string>
-		<string>F53E098D-D08E-4CE2-990A-B0BD70E60614</string>
-		<string>D121FC61-96A4-4B8F-8709-280EDA876FF3</string>
-		<string>488B387C-50C0-4B2D-9260-5A7E7EAF9B42</string>
-		<string>BF487539-8085-4FF4-8601-1AD20FABAEDC</string>
-		<string>83EED068-8C1C-4BAF-9893-902DC00616AB</string>
-		<string>0CCBE04E-F4E2-4E55-9506-7DE67ACF8388</string>
-		<string>05DFF82C-5A29-4EBD-93FE-C165FFFB5EA8</string>
-		<string>E98FB8F9-7302-431D-8BF2-275A68A6126C</string>
-		<string>AFE1D078-EA16-45F5-AD8A-FAC1B523D861</string>
-		<string>C7AAAE45-487A-4B61-8962-D47675AAC05F</string>
-		<string>2B73EC5F-06D2-460C-A14F-6FA05AFCF0CC</string>
-		<string>0E85EC81-2FAB-4648-B590-119CC1BB6E41</string>
-		<string>A71A18CF-2D71-4BFF-AA0C-D9B8C59BC4EB</string>
-		<string>A150C2D8-25B3-4339-BC92-8A0160A70486</string>
-		<string>3D383096-A03F-4EF8-9060-3C727045AB34</string>
-		<string>D7A7D3C9-1714-4C50-8CC0-D83A03883E8F</string>
-		<string>AAD5D511-6BE7-41DA-8F2B-1593A48FBB08</string>
-		<string>6C9D6B3D-D8E9-4606-9534-577C8D21FFF6</string>
-		<string>7F46C90A-595B-4B83-A4F7-058F63CE4218</string>
-		<string>7C6E88FA-CA0E-4110-8C75-A94E54286A75</string>
-		<string>87D5F8AD-8DA6-4AED-A0D8-B51CAC980445</string>
-		<string>4E9D15B5-65D6-4A9A-9DEC-DE041D68C06F</string>
-		<string>C44ED391-614F-4BA2-BB0F-87668EEA9954</string>
-		<string>4A6EFD6B-88E2-4822-AD48-03460EDBC796</string>
-		<string>988C8AEF-FC71-4455-9C4F-9338C05685A4</string>
-		<string>451A0596-1F72-4AFB-AF2F-45900FABB0F7</string>
-		<string>A05CBDD6-845D-45EB-94FB-F8787F5456BE</string>
-		<string>B2C3ADE8-E19E-4B87-9C6C-593D490114C7</string>
-		<string>97DE939B-D243-4D5C-B953-1C9090912E7C</string>
-		<string>34FEBB9F-73CD-4DD4-A0A3-1CF2A5E3DE78</string>
-		<string>E16D24D2-CC7E-4786-BE0B-1725FC865D78</string>
-		<string>21C0D711-F32A-4665-AA0D-B136F9DD3945</string>
-		<string>49D69DEC-6991-49F4-8D9B-BA60BFDD3D17</string>
-		<string>DAE6A754-D906-4763-B816-CE67125CEF08</string>
-		<string>263C94DC-63CF-4BA3-9692-C5582CA8F1AB</string>
-		<string>6021BBDC-4AAD-447B-A0C2-A4BB31721558</string>
-		<string>3DDB99C4-486D-4C11-A217-5680FDD8EC19</string>
-		<string>FD010022-E0E7-44DB-827F-33F7D9310DA2</string>
-		<string>4991BB86-736E-4758-B9B2-E4FA90B9368F</string>
-		<string>36853A11-0307-4AE7-B835-7CE6358717A5</string>
-		<string>206D54AF-E67A-4DF0-B7F4-3D42FEB81685</string>
-		<string>51954118-81D7-42B6-9A10-BE23D8B9FFE2</string>
-		<string>567E3D18-BF2B-4379-8927-2777EC9F495E</string>
-		<string>ECBA4CA0-275F-460E-85BE-E82FEA2E2B26</string>
-		<string>338EC03D-3FF4-4435-94E8-1CEF20CEC75D</string>
-		<string>FDD73070-6D32-4301-A86A-C55B77C3D8ED</string>
-		<string>3C04589C-5127-478E-97B3-CA7DD2EA7ECD</string>
-		<string>689120C9-AB40-4081-8268-9362E00FA4A0</string>
-		<string>E54F7077-3C33-4B53-A4F7-21E16132D3AD</string>
-		<string>02913388-EE8E-4C55-AC94-94F3D751F47E</string>
-		<string>7A3CECED-452B-438E-A5C6-95B6BDC43243</string>
-		<string>CD748479-D2A4-4AB5-95BD-4C89512BA210</string>
-		<string>844DBD70-BC23-4FBF-9C18-F4A610239DF2</string>
-		<string>1DD13CF5-39C0-4F10-B655-56DACEBC7F94</string>
-		<string>F3C5F719-EF03-4FF7-A777-4A8402FE3B6B</string>
-		<string>B563E0D7-513D-49B4-9733-1B04A6F25A74</string>
-		<string>5A3754FC-43A3-462B-AB42-E3E951872E6F</string>
-		<string>BD4CFD7B-1AC0-4569-9BDA-FD491F41F4E6</string>
-		<string>9E0B4D4B-2956-4B3A-800A-3D8CE54E66BF</string>
-		<string>BA9440C9-36C3-4031-BB61-67B581D5B179</string>
-		<string>B0CE57EC-FB2E-4482-8CCE-448DC2588715</string>
-		<string>07D1F987-7CDB-4EAD-B64A-27A93051700E</string>
-		<string>A3B9B76B-2BC5-425C-AB24-9FAAFC375798</string>
-		<string>5DA9E1E8-2C54-420A-9B84-B040A1AF2B9E</string>
-		<string>669A86AD-936F-4EDA-8E4E-6863804072DA</string>
-		<string>6C6B9849-9631-49FF-A9F9-F0E94A1512C5</string>
-		<string>1F72122A-35AD-4BA1-AA01-889A10319666</string>
-		<string>E23FE534-8061-4828-98A5-46270B6910B0</string>
-		<string>197709C5-8382-4A59-B6D7-31A0CC0F23B7</string>
-		<string>9D9E7BA3-8C5D-4532-83EA-326358C2F5BB</string>
-		<string>98182B9E-7C61-4824-BE4C-9CD69C816037</string>
-		<string>CB03D11A-7204-48D0-92C1-E109034403E7</string>
-		<string>52B8BF63-F09E-4789-8407-06168A8AE666</string>
-		<string>B79B9DAB-ABEF-44F6-BF7E-635E7BA11DFD</string>
-		<string>4E409AA4-E7D4-46B7-A4E9-E32F992B33E9</string>
-		<string>8021944C-CEA4-4983-8D1C-78D18D4004A1</string>
-		<string>2514FC26-468C-4D08-A788-494A444C4286</string>
-		<string>66802933-B49F-479B-9DF9-1D898FF1FA90</string>
-		<string>855FC4EF-7B1E-48EE-AD4E-5ECB8ED79D1C</string>
-		<string>4B72C5C3-6CA7-41AC-B2F9-51DEA25D469E</string>
-		<string>21E75321-0CF7-45E8-A297-BCC7C0DDDD15</string>
-		<string>E16EE658-1CA0-4950-954B-B962E50B754F</string>
-		<string>840B9C4C-7037-4C3B-9028-EB9DC75EDB3E</string>
-		<string>B9E3A6DF-875D-11D9-897C-000393CBCE2E</string>
-		<string>418F1817-255F-430A-B09A-222964ED66A7</string>
-		<string>8F594E5E-6F46-4E98-B5FB-1C8F3BA9828F</string>
-		<string>50C56AC8-48F3-42A0-AF10-8164464AFAEF</string>
-		<string>397FA09F-A30F-4EE4-920C-318D5004EE97</string>
-		<string>332AA973-AA71-48CB-AEE9-1D71E11019AC</string>
-		<string>8EBBB26F-980E-404E-8366-74E5772298F6</string>
-		<string>678BDB83-FBBD-4E8E-BE0B-E1A98AECB247</string>
-		<string>A4E89D97-D5ED-48BB-B5FF-1BFB79211FCD</string>
-		<string>8CEF9711-88D5-4202-AFB9-29EF4EFD25C1</string>
-		<string>C3C48948-4F49-484E-A8DE-DEB44723099E</string>
-		<string>209D5D73-7A77-4931-A158-3FB6D5B48A88</string>
-		<string>31D1F145-33AB-4441-BA11-4D1C46928C4C</string>
-		<string>00F66D41-25AF-4597-B67D-E540965A5222</string>
-		<string>5297FD0C-98B1-4514-BBD1-1516810BECA6</string>
-		<string>B32C147D-44A6-478A-9D5D-189D7831E9A7</string>
-		<string>43A61A22-6BEE-4997-961C-1CDE739C05FE</string>
-		<string>A243E96F-DC21-4AA0-B340-13A7674F6AFF</string>
-		<string>429D0EF5-580D-4166-8F79-713DE96B77F1</string>
-		<string>0E831E03-67E1-4357-8323-C60685C23C4F</string>
-		<string>671F05E2-D9CC-485E-BB1B-B13EF20FAC65</string>
-		<string>4C79256C-480A-459C-BDE8-BB0D972811DB</string>
-		<string>79FEC3CC-2A40-4611-9A85-ECDB22FE0701</string>
-		<string>711ED6C3-0F18-41FB-9A7D-3094BB319A85</string>
-		<string>A072BB1E-1DD1-45D3-9346-8CA3BA21B364</string>
-		<string>1B925A4D-8EE4-442B-9254-293599F5717F</string>
-		<string>68B21F6F-5D89-41FA-A19C-F29C2F912B4E</string>
-		<string>82F8EEE0-2452-411E-8102-7BFDDBCA2E72</string>
-		<string>09A11FDA-49FC-4466-8787-8D1D5D111A89</string>
-		<string>29340695-E426-4F77-8CF7-C59360A549F4</string>
-		<string>F91C25EC-EC76-498B-BFB5-FDA8F57C5875</string>
-		<string>7850AD5C-A90D-4E2C-A931-EADFF8D3D9A3</string>
-		<string>05655BD8-23C6-445F-BFD1-420BF25C3030</string>
-		<string>33639D7A-BD8C-4396-9C44-307B8AC87C9E</string>
-		<string>DB457094-1AC9-4856-AEFC-43A9576B6775</string>
-		<string>B186BAC0-D981-41AC-B8F4-34BAD2BC4EE6</string>
-		<string>F46A4687-E52D-40D2-9072-C215645EDBC6</string>
-		<string>942F20E2-C40A-44B8-A3F2-99AAC68CB534</string>
-		<string>1C60D589-DD46-4109-90CA-6B34AEA2F298</string>
-		<string>0CB48BCA-3F6E-4AE0-85BC-08A1D2508216</string>
-		<string>20AAD0BC-075D-4EC0-9057-E3E5E62C4125</string>
-		<string>5B46ECFD-23A4-4F0C-9951-F64C19C72C2B</string>
-		<string>46BF99AD-E172-4D49-BCF7-072F4730E1D9</string>
-		<string>3BA6762A-BB6B-489E-8006-F30F386AEF48</string>
-		<string>8343ACF4-EEB7-44B5-B835-94826466D4D5</string>
-		<string>B904D4AA-D15D-48A4-8EB2-563BAF489332</string>
-		<string>CC300D44-6C3F-4F6C-A8AB-86F5A2DC57CF</string>
-		<string>2DBEE50B-3097-4A57-AB48-3586CF392D8B</string>
-		<string>0BA2B2F1-E767-4A03-9791-0AC0183251F1</string>
-		<string>B46D35B8-5DEB-4C10-A110-BA1965A2EB9C</string>
-		<string>05EE1046-5ED7-48F5-8693-1F066163B2F4</string>
-		<string>A7BF14E6-59B1-42E5-8755-8A72BF13685E</string>
-		<string>EEE6D060-C5A0-400D-A2E0-0835013C5365</string>
-		<string>E00B62AC-6B1C-11D9-9B1F-000D93589AF6</string>
-		<string>1D26F26C-C6F7-434F-84F8-FEE895372E8A</string>
-		<string>6FEAF60F-F0F3-4618-9259-DE93285F50D1</string>
-		<string>92E190C9-A861-4025-92D4-D6B5A24C22D4</string>
-		<string>A5D50494-EB97-48DE-A2BE-322DF52A7A7A</string>
-		<string>6D75102B-6E51-4360-8F12-BE12327B6AE6</string>
-		<string>AEDD6A5F-417F-4177-8589-B07518ACA9DE</string>
-		<string>1A7701FA-D866-498C-AD4C-7846538DB535</string>
-	</array>
-	<key>uuid</key>
-	<string>467B298F-6227-11D9-BFB1-000D93589AF6</string>
-</dict>
-</plist>
diff --git a/bundles/text.tmbundle/Commands/Convert to ASCII.plist b/bundles/text.tmbundle/Commands/Convert to ASCII.plist
deleted file mode 100644
index d892bbcaa..000000000
--- a/bundles/text.tmbundle/Commands/Convert to ASCII.plist	
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>command</key>
-	<string>iconv -c -f utf-8 -t ASCII//TRANSLIT</string>
-	<key>fallbackInput</key>
-	<string>word</string>
-	<key>input</key>
-	<string>selection</string>
-	<key>name</key>
-	<string>Transliterate Word / Selection to ASCII</string>
-	<key>output</key>
-	<string>replaceSelectedText</string>
-	<key>uuid</key>
-	<string>3AA8A593-6E4C-11D9-91AF-000D93589AF6</string>
-</dict>
-</plist>
diff --git a/bundles/text.tmbundle/Commands/Convert to hex.plist b/bundles/text.tmbundle/Commands/Convert to hex.plist
deleted file mode 100644
index 50466cd70..000000000
--- a/bundles/text.tmbundle/Commands/Convert to hex.plist	
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>command</key>
-	<string>#!/usr/bin/env ruby -wKU
-print STDIN.read.unpack("U*").map { |e| sprintf('0x%02x', e) }.join(' ')</string>
-	<key>fallbackInput</key>
-	<string>character</string>
-	<key>input</key>
-	<string>selection</string>
-	<key>keyEquivalent</key>
-	<string>^X</string>
-	<key>name</key>
-	<string>Convert Character / Selection to Hex</string>
-	<key>output</key>
-	<string>replaceSelectedText</string>
-	<key>uuid</key>
-	<string>7C9736B2-B851-11D9-B05D-00039369B986</string>
-</dict>
-</plist>
diff --git a/bundles/text.tmbundle/Commands/Copy Matching Lines into New Document.tmCommand b/bundles/text.tmbundle/Commands/Copy Matching Lines into New Document.tmCommand
deleted file mode 100644
index 63a8a4326..000000000
--- a/bundles/text.tmbundle/Commands/Copy Matching Lines into New Document.tmCommand	
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>bundleUUID</key>
-	<string>B7BC3FFD-6E4B-11D9-91AF-000D93589AF6</string>
-	<key>command</key>
-	<string>res=$(ruby -rui -e"print TextMate::UI.request_string(:title =&gt; 'Filter Matching Lines', :prompt =&gt; 'Enter a pattern:', :button1 =&gt; 'Filter', :button2 =&gt; 'Cancel').to_s")
-
-[[ -z "$res" ]] &amp;&amp; exit_discard
-export pattern="$res"
-
-# This could be done with grep, but Python's RE is closer to oniguruma
-"${TM_PYTHON:-python}" -c '
-import sys, os, re, traceback
-try:
-  pattern = re.compile(os.environ["pattern"])
-except re.error, e:
-  sys.stderr.write("Invalid pattern: %s" % e)
-  sys.exit(1)
-for line in sys.stdin:
-  if pattern.search(line):
-    sys.stdout.write(line)
-' || exit_show_tool_tip
-</string>
-	<key>input</key>
-	<string>selection</string>
-	<key>name</key>
-	<string>Copy Matching Lines into New Document</string>
-	<key>output</key>
-	<string>openAsNewDocument</string>
-	<key>uuid</key>
-	<string>965DF29E-4EBD-457A-9A61-56D920C35F72</string>
-</dict>
-</plist>
diff --git a/bundles/text.tmbundle/Commands/Copy Non-Matching Lines into New Document.tmCommand b/bundles/text.tmbundle/Commands/Copy Non-Matching Lines into New Document.tmCommand
deleted file mode 100644
index b97dcc881..000000000
--- a/bundles/text.tmbundle/Commands/Copy Non-Matching Lines into New Document.tmCommand	
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>bundleUUID</key>
-	<string>B7BC3FFD-6E4B-11D9-91AF-000D93589AF6</string>
-	<key>command</key>
-	<string>res=$(ruby -rui -e"print TextMate::UI.request_string(:title =&gt; 'Filter Non-Matching Lines', :prompt =&gt; 'Enter a pattern:', :button1 =&gt; 'Filter', :button2 =&gt; 'Cancel').to_s")
-
-[[ -z "$res" ]] &amp;&amp; exit_discard
-export pattern="$res"
-
-# This could be done with grep, but Python's RE is closer to oniguruma
-"${TM_PYTHON:-python}" -c '
-import sys, os, re, traceback
-try:
-  pattern = re.compile(os.environ["pattern"])
-except re.error, e:
-  sys.stderr.write("Invalid pattern: %s" % e)
-  sys.exit(1)
-for line in sys.stdin:
-  if not pattern.search(line):
-    sys.stdout.write(line)
-' || exit_show_tool_tip
-</string>
-	<key>input</key>
-	<string>selection</string>
-	<key>name</key>
-	<string>Copy Non-Matching Lines into New Document</string>
-	<key>output</key>
-	<string>openAsNewDocument</string>
-	<key>uuid</key>
-	<string>8109F2C2-FF63-46F7-83F3-D2318290FC11</string>
-</dict>
-</plist>
diff --git a/bundles/text.tmbundle/Commands/Decrypt selection.plist b/bundles/text.tmbundle/Commands/Decrypt selection.plist
deleted file mode 100644
index 1cfeace9e..000000000
--- a/bundles/text.tmbundle/Commands/Decrypt selection.plist	
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>command</key>
-	<string>get_pw () {
-  ruby -rui -e"print TextMate::UI.request_secure_string(:title =&gt; 'Decrypt AES 128 Encrypted Text', :prompt =&gt; '$1', :button1 =&gt; '$2', :button2 =&gt; 'Cancel').to_s"
-}
-
-pw=$(get_pw 'What is the password?' Decrypt)
-[[ -z "$pw" ]] &amp;&amp; exit_discard
-
-if ! openssl enc -d -aes128 -base64 -pass "pass:$pw"; then
-   exit_show_tool_tip
-fi
-</string>
-	<key>fallbackInput</key>
-	<string>document</string>
-	<key>input</key>
-	<string>selection</string>
-	<key>keyEquivalent</key>
-	<string>^@E</string>
-	<key>name</key>
-	<string>AES Decrypt Document / Selection With Password…</string>
-	<key>output</key>
-	<string>replaceSelectedText</string>
-	<key>uuid</key>
-	<string>4B22577B-BC8E-11D9-8946-000D93589AF6</string>
-</dict>
-</plist>
diff --git a/bundles/text.tmbundle/Commands/Distill Document : Selection.tmCommand b/bundles/text.tmbundle/Commands/Distill Document : Selection.tmCommand
deleted file mode 100644
index 13a4b72fe..000000000
--- a/bundles/text.tmbundle/Commands/Distill Document : Selection.tmCommand	
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>bundleUUID</key>
-	<string>B7BC3FFD-6E4B-11D9-91AF-000D93589AF6</string>
-	<key>command</key>
-	<string>res=$(ruby -rui -e"print TextMate::UI.request_string(:title =&gt; 'Distill Text', :prompt =&gt; 'Enter a pattern:', :button1 =&gt; 'Filter', :button2 =&gt; 'Cancel').to_s")
-
-[[ -z "$res" ]] &amp;&amp; exit_discard
-export pattern="$res"
-
-# This could be done with grep, but Python's RE is closer to oniguruma
-"${TM_PYTHON:-python}" -c '
-import sys, os, re, traceback
-try:
-  pattern = re.compile(os.environ["pattern"])
-except re.error, e:
-  sys.stderr.write("Invalid pattern: %s" % e)
-  sys.exit(1)
-mate = "\"%s/bin/mate\" -a" % os.environ["TM_SUPPORT_PATH"]
-pb = os.popen(mate, "w")
-for line in sys.stdin:
-  if pattern.search(line):
-    pb.write(line)
-  else:
-    sys.stdout.write(line)
-pb.close()
-' || exit_show_tool_tip
-
-</string>
-	<key>input</key>
-	<string>selection</string>
-	<key>name</key>
-	<string>Distill Document / Selection</string>
-	<key>output</key>
-	<string>replaceSelectedText</string>
-	<key>uuid</key>
-	<string>DA5AD0D9-F7C0-4010-9FDC-FF01B0434F9A</string>
-</dict>
-</plist>
diff --git a/bundles/text.tmbundle/Commands/Duplicate Line.plist b/bundles/text.tmbundle/Commands/Duplicate Line.plist
deleted file mode 100644
index dbdef7157..000000000
--- a/bundles/text.tmbundle/Commands/Duplicate Line.plist	
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>command</key>
-	<string>#!/usr/bin/env ruby -wKU
-
-# If there’s a selection, output that twice (as a snippet)
-# leaving the duplicate as the new selected text.
-# Otherwise split the current line around the caret and
-# output “right, left” to duplicate the line, leaving the
-# caret in the same place on the new line
-
-require File.join(ENV["TM_SUPPORT_PATH"], "lib/exit_codes.rb")
-require File.join(ENV["TM_SUPPORT_PATH"], "lib/escape.rb")
-
-if ENV['TM_SELECTED_TEXT'] != nil
-	TextMate.exit_insert_snippet(e_sn(ENV['TM_SELECTED_TEXT']) + "${0:" + e_snp(ENV['TM_SELECTED_TEXT']) + "}")
-else
-	col   = ENV['TM_LINE_INDEX'].to_i
-	TextMate.exit_insert_text(ENV['TM_CURRENT_LINE'][col..-1] + "\n" + ENV['TM_CURRENT_LINE'][0...col])
-end</string>
-	<key>fallbackInput</key>
-	<string>none</string>
-	<key>input</key>
-	<string>selection</string>
-	<key>keyEquivalent</key>
-	<string>^D</string>
-	<key>name</key>
-	<string>Duplicate Line / Selection</string>
-	<key>output</key>
-	<string>afterSelectedText</string>
-	<key>uuid</key>
-	<string>C46A9DBC-0B06-49DF-838B-491B529ECF22</string>
-</dict>
-</plist>
diff --git a/bundles/text.tmbundle/Commands/Encrypt selection.plist b/bundles/text.tmbundle/Commands/Encrypt selection.plist
deleted file mode 100644
index d44587104..000000000
--- a/bundles/text.tmbundle/Commands/Encrypt selection.plist	
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>command</key>
-	<string>get_pw () {
-  ruby -rui -e"print TextMate::UI.request_secure_string(:title =&gt; 'Encrypt Text With AES 128', :prompt =&gt; '$1', :button1 =&gt; '$2', :button2 =&gt; 'Cancel').to_s"
-}
-pw1=$(get_pw 'What password should be used?'   Continue)
-[[ -z "$pw1" ]] &amp;&amp; exit_discard
-pw2=$(get_pw 'Enter password again to verify.' Encrypt)
-
-if [[ "$pw1" == "$pw2" ]];
-  then openssl enc -e -aes128 -base64 -pass "pass:$pw1"
-  else exit_show_tool_tip 'Password mismatch! Please play again.'
-fi
-</string>
-	<key>fallbackInput</key>
-	<string>document</string>
-	<key>input</key>
-	<string>selection</string>
-	<key>keyEquivalent</key>
-	<string>^@E</string>
-	<key>name</key>
-	<string>AES Encrypt Document / Selection With Password…</string>
-	<key>output</key>
-	<string>replaceSelectedText</string>
-	<key>uuid</key>
-	<string>D39DC176-BC8D-11D9-8946-000D93589AF6</string>
-</dict>
-</plist>
diff --git a/bundles/text.tmbundle/Commands/Enumerate Lines.plist b/bundles/text.tmbundle/Commands/Enumerate Lines.plist
deleted file mode 100644
index 162a37937..000000000
--- a/bundles/text.tmbundle/Commands/Enumerate Lines.plist	
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>command</key>
-	<string>cat -n|expand -8</string>
-	<key>fallbackInput</key>
-	<string>document</string>
-	<key>input</key>
-	<string>selection</string>
-	<key>keyEquivalent</key>
-	<string></string>
-	<key>name</key>
-	<string>Add Line Numbers to Document / Selection</string>
-	<key>output</key>
-	<string>replaceSelectedText</string>
-	<key>uuid</key>
-	<string>8085013F-8DEA-11D9-B421-000D93589AF6</string>
-</dict>
-</plist>
diff --git a/bundles/text.tmbundle/Commands/Open Current URL.plist b/bundles/text.tmbundle/Commands/Open Current URL.plist
deleted file mode 100644
index b563a0d51..000000000
--- a/bundles/text.tmbundle/Commands/Open Current URL.plist	
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>command</key>
-	<string>open "$(cat)"
-</string>
-	<key>fallbackInput</key>
-	<string>scope</string>
-	<key>input</key>
-	<string>selection</string>
-	<key>keyEquivalent</key>
-	<string></string>
-	<key>name</key>
-	<string>Open Current URL</string>
-	<key>output</key>
-	<string>discard</string>
-	<key>scope</key>
-	<string>markup.underline.link - markup.underline.link.relative</string>
-	<key>uuid</key>
-	<string>5A08E461-05CC-4C03-9DC8-BF118594EA3E</string>
-</dict>
-</plist>
diff --git a/bundles/text.tmbundle/Commands/Randomize Lines in Document : Selection.tmCommand b/bundles/text.tmbundle/Commands/Randomize Lines in Document : Selection.tmCommand
deleted file mode 100644
index 528aba117..000000000
--- a/bundles/text.tmbundle/Commands/Randomize Lines in Document : Selection.tmCommand	
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>command</key>
-	<string>ruby -pe'$_ = (rand * 100000000).round.to_s + "\t" + $_'|sort|cut -f2-</string>
-	<key>input</key>
-	<string>selection</string>
-	<key>name</key>
-	<string>Randomize Lines in Document / Selection</string>
-	<key>output</key>
-	<string>replaceSelectedText</string>
-	<key>uuid</key>
-	<string>90291A6E-34F6-4FD5-BA82-6BB6FB4DD492</string>
-</dict>
-</plist>
diff --git a/bundles/text.tmbundle/Commands/Sort & Uniq.plist b/bundles/text.tmbundle/Commands/Sort & Uniq.plist
deleted file mode 100644
index 08e43318a..000000000
--- a/bundles/text.tmbundle/Commands/Sort & Uniq.plist	
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>command</key>
-	<string>sort -f|uniq</string>
-	<key>input</key>
-	<string>selection</string>
-	<key>keyEquivalent</key>
-	<string></string>
-	<key>name</key>
-	<string>Sort Lines &amp; Remove Duplicates</string>
-	<key>output</key>
-	<string>replaceSelectedText</string>
-	<key>uuid</key>
-	<string>3010E2A8-6E4F-11D9-A18D-000D93589AF6</string>
-</dict>
-</plist>
diff --git a/bundles/text.tmbundle/Commands/Sort.plist b/bundles/text.tmbundle/Commands/Sort.plist
deleted file mode 100644
index bb6a20929..000000000
--- a/bundles/text.tmbundle/Commands/Sort.plist
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>command</key>
-	<string>sort -f</string>
-	<key>fallbackInput</key>
-	<string>document</string>
-	<key>input</key>
-	<string>selection</string>
-	<key>keyEquivalent</key>
-	<string></string>
-	<key>name</key>
-	<string>Sort Lines in Document / Selection</string>
-	<key>output</key>
-	<string>replaceSelectedText</string>
-	<key>uuid</key>
-	<string>273853DF-6E4F-11D9-A18D-000D93589AF6</string>
-</dict>
-</plist>
diff --git a/bundles/text.tmbundle/Commands/Speak Document : Selection.tmCommand b/bundles/text.tmbundle/Commands/Speak Document : Selection.tmCommand
deleted file mode 100644
index 297cc2f8a..000000000
--- a/bundles/text.tmbundle/Commands/Speak Document : Selection.tmCommand	
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>command</key>
-	<string>say `echo "$TM_SELECTED_TEXT"` &amp;</string>
-	<key>input</key>
-	<string>selection</string>
-	<key>name</key>
-	<string>Speak Document / Selection</string>
-	<key>output</key>
-	<string>discard</string>
-	<key>uuid</key>
-	<string>D26BEEE3-7439-4B7E-AD9D-9A144CDC5873</string>
-</dict>
-</plist>
diff --git a/bundles/text.tmbundle/Commands/Strip non-printables.plist b/bundles/text.tmbundle/Commands/Strip non-printables.plist
deleted file mode 100644
index 792398628..000000000
--- a/bundles/text.tmbundle/Commands/Strip non-printables.plist	
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>command</key>
-	<string>perl -pe 's/[^\t\n\x20-\xFF]|\x7F|\xC2[\x80-\x9F]//g'</string>
-	<key>fallbackInput</key>
-	<string>document</string>
-	<key>input</key>
-	<string>selection</string>
-	<key>name</key>
-	<string>Remove Unprintable Characters in Document / Selection</string>
-	<key>output</key>
-	<string>replaceSelectedText</string>
-	<key>uuid</key>
-	<string>BEC25DC3-6E4B-11D9-91AF-000D93589AF6</string>
-</dict>
-</plist>
diff --git a/bundles/text.tmbundle/Commands/Strip trailing spaces.plist b/bundles/text.tmbundle/Commands/Strip trailing spaces.plist
deleted file mode 100644
index dda9a4559..000000000
--- a/bundles/text.tmbundle/Commands/Strip trailing spaces.plist	
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>command</key>
-	<string>perl -pe 's/[\t ]+$//g'</string>
-	<key>fallbackInput</key>
-	<string>document</string>
-	<key>input</key>
-	<string>selection</string>
-	<key>name</key>
-	<string>Remove Trailing Spaces in Document / Selection</string>
-	<key>output</key>
-	<string>replaceSelectedText</string>
-	<key>uuid</key>
-	<string>0F8C1F78-6E4C-11D9-91AF-000D93589AF6</string>
-</dict>
-</plist>
diff --git a/bundles/text.tmbundle/Commands/Word Count.plist b/bundles/text.tmbundle/Commands/Word Count.plist
deleted file mode 100644
index 9f6af2d55..000000000
--- a/bundles/text.tmbundle/Commands/Word Count.plist	
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>command</key>
-	<string>#!/usr/bin/env ruby -wKU
-
-def pretty(number)
-  number.to_s.gsub(/\d{1,3}(?=\d{3}+(?!\d))/, '\0,')
-end
-
-counts = `wc -lwc`.scan(/\d+/)
-counts[0] = counts[0].to_i + 1 # increase one to the line count
-
-%w[ line word byte ].each do |unit|
-  cnt    = counts.shift
-  plural = cnt.to_i != 1 ? 's' : ''
-  printf("%11.11s %s%s\n", pretty(cnt), unit, plural)
-end
-</string>
-	<key>fallbackInput</key>
-	<string>document</string>
-	<key>input</key>
-	<string>selection</string>
-	<key>keyEquivalent</key>
-	<string>^N</string>
-	<key>name</key>
-	<string>Statistics for Document / Selection (Word Count)</string>
-	<key>output</key>
-	<string>showAsTooltip</string>
-	<key>uuid</key>
-	<string>AA202E76-8A0A-11D9-B85D-000D93589AF6</string>
-</dict>
-</plist>
diff --git a/bundles/text.tmbundle/Macros/Delete Line.plist b/bundles/text.tmbundle/Macros/Delete Line.plist
deleted file mode 100644
index 52645b1c9..000000000
--- a/bundles/text.tmbundle/Macros/Delete Line.plist	
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>commands</key>
-	<array>
-		<dict>
-			<key>command</key>
-			<string>selectHardLine:</string>
-		</dict>
-		<dict>
-			<key>command</key>
-			<string>deleteBackward:</string>
-		</dict>
-	</array>
-	<key>keyEquivalent</key>
-	<string>^K</string>
-	<key>name</key>
-	<string>Delete Line</string>
-	<key>scopeType</key>
-	<string>local</string>
-	<key>uuid</key>
-	<string>FB8960DB-AA2E-11D9-8E27-000D93589AF6</string>
-</dict>
-</plist>
diff --git a/bundles/text.tmbundle/Macros/Delete to Beginning of Line.tmMacro b/bundles/text.tmbundle/Macros/Delete to Beginning of Line.tmMacro
deleted file mode 100644
index f2c5dc42e..000000000
--- a/bundles/text.tmbundle/Macros/Delete to Beginning of Line.tmMacro	
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>commands</key>
-	<array>
-		<dict>
-			<key>command</key>
-			<string>deleteToBeginningOfLine:</string>
-		</dict>
-	</array>
-	<key>keyEquivalent</key>
-	<string>@</string>
-	<key>name</key>
-	<string>Delete to Beginning of Line</string>
-	<key>uuid</key>
-	<string>F22BEB71-2DE3-4183-BB10-0199CC328169</string>
-</dict>
-</plist>
diff --git a/bundles/text.tmbundle/Macros/EOL + . + LF.plist b/bundles/text.tmbundle/Macros/EOL + . + LF.plist
deleted file mode 100644
index 696d519cd..000000000
--- a/bundles/text.tmbundle/Macros/EOL + . + LF.plist	
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>commands</key>
-	<array>
-		<dict>
-			<key>command</key>
-			<string>moveToEndOfParagraph:</string>
-		</dict>
-		<dict>
-			<key>argument</key>
-			<string>.</string>
-			<key>command</key>
-			<string>insertText:</string>
-		</dict>
-		<dict>
-			<key>command</key>
-			<string>insertNewline:</string>
-		</dict>
-	</array>
-	<key>keyEquivalent</key>
-	<string>$@
</string>
-	<key>name</key>
-	<string>Move to EOL and Insert "." + LF</string>
-	<key>scope</key>
-	<string>text</string>
-	<key>uuid</key>
-	<string>E86C9A77-5B48-43C6-A712-A61B616269E6</string>
-</dict>
-</plist>
diff --git a/bundles/text.tmbundle/Macros/EOL + ..plist b/bundles/text.tmbundle/Macros/EOL + ..plist
deleted file mode 100644
index 811816a32..000000000
--- a/bundles/text.tmbundle/Macros/EOL + ..plist	
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>commands</key>
-	<array>
-		<dict>
-			<key>command</key>
-			<string>moveToEndOfParagraph:</string>
-		</dict>
-		<dict>
-			<key>argument</key>
-			<string>.</string>
-			<key>command</key>
-			<string>insertText:</string>
-		</dict>
-	</array>
-	<key>keyEquivalent</key>
-	<string>~@
</string>
-	<key>name</key>
-	<string>Move to EOL and Insert “.”</string>
-	<key>scope</key>
-	<string>text</string>
-	<key>scopeType</key>
-	<string>local</string>
-	<key>uuid</key>
-	<string>80CC504F-B13B-11D9-B41F-000D93589AF6</string>
-</dict>
-</plist>
diff --git a/bundles/text.tmbundle/Macros/Join Lines.plist b/bundles/text.tmbundle/Macros/Join Lines.plist
deleted file mode 100644
index 3787bca54..000000000
--- a/bundles/text.tmbundle/Macros/Join Lines.plist	
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>commands</key>
-	<array>
-		<dict>
-			<key>argument</key>
-			<dict>
-				<key>action</key>
-				<string>findNext</string>
-				<key>findInProjectIgnoreCase</key>
-				<false/>
-				<key>findInProjectRegularExpression</key>
-				<false/>
-				<key>findString</key>
-				<string>$\n\s*</string>
-				<key>ignoreCase</key>
-				<false/>
-				<key>regularExpression</key>
-				<true/>
-				<key>replaceAllScope</key>
-				<string>document</string>
-				<key>replaceString</key>
-				<string>key</string>
-				<key>wrapAround</key>
-				<false/>
-			</dict>
-			<key>command</key>
-			<string>findWithOptions:</string>
-		</dict>
-		<dict>
-			<key>command</key>
-			<string>deleteForward:</string>
-		</dict>
-	</array>
-	<key>keyEquivalent</key>
-	<string>^J</string>
-	<key>name</key>
-	<string>Join Line With Next</string>
-	<key>scopeType</key>
-	<string>local</string>
-	<key>uuid</key>
-	<string>3D7504EE-B927-4D3D-A3CC-BFB189027EE7</string>
-</dict>
-</plist>
diff --git a/bundles/text.tmbundle/Preferences/Markup style: Bold.plist b/bundles/text.tmbundle/Preferences/Markup style: Bold.plist
deleted file mode 100644
index 5a63bd8b7..000000000
--- a/bundles/text.tmbundle/Preferences/Markup style: Bold.plist	
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>name</key>
-	<string>Style: Bold</string>
-	<key>scope</key>
-	<string>markup.bold</string>
-	<key>settings</key>
-	<dict>
-		<key>bold</key>
-		<string>1</string>
-	</dict>
-	<key>uuid</key>
-	<string>A088E2CA-03E7-4A8C-855C-AC954E739D6D</string>
-</dict>
-</plist>
diff --git a/bundles/text.tmbundle/Preferences/Markup style: Italic.plist b/bundles/text.tmbundle/Preferences/Markup style: Italic.plist
deleted file mode 100644
index 9ea3216d3..000000000
--- a/bundles/text.tmbundle/Preferences/Markup style: Italic.plist	
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>name</key>
-	<string>Style: Italic</string>
-	<key>scope</key>
-	<string>markup.italic</string>
-	<key>settings</key>
-	<dict>
-		<key>italic</key>
-		<string>1</string>
-	</dict>
-	<key>uuid</key>
-	<string>2EE6D01F-50BC-434B-BE45-54D29CACB3E0</string>
-</dict>
-</plist>
diff --git a/bundles/text.tmbundle/Preferences/Markup style: Underline.plist b/bundles/text.tmbundle/Preferences/Markup style: Underline.plist
deleted file mode 100644
index 11a01ca40..000000000
--- a/bundles/text.tmbundle/Preferences/Markup style: Underline.plist	
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>name</key>
-	<string>Style: Underline</string>
-	<key>scope</key>
-	<string>markup.underline</string>
-	<key>settings</key>
-	<dict>
-		<key>underline</key>
-		<string>1</string>
-	</dict>
-	<key>uuid</key>
-	<string>4CCD8369-40E4-422A-ABE7-C32F3721AFEF</string>
-</dict>
-</plist>
diff --git a/bundles/text.tmbundle/Preferences/Miscellaneous.plist b/bundles/text.tmbundle/Preferences/Miscellaneous.plist
deleted file mode 100644
index 04ffaf9d8..000000000
--- a/bundles/text.tmbundle/Preferences/Miscellaneous.plist
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>name</key>
-	<string>Miscellaneous</string>
-	<key>settings</key>
-	<dict>
-		<key>highlightPairs</key>
-		<array>
-			<array>
-				<string>(</string>
-				<string>)</string>
-			</array>
-			<array>
-				<string>{</string>
-				<string>}</string>
-			</array>
-			<array>
-				<string>[</string>
-				<string>]</string>
-			</array>
-			<array>
-				<string>“</string>
-				<string>”</string>
-			</array>
-			<array>
-				<string>‘</string>
-				<string>’</string>
-			</array>
-		</array>
-		<key>smartTypingPairs</key>
-		<array>
-			<array>
-				<string>"</string>
-				<string>"</string>
-			</array>
-			<array>
-				<string>(</string>
-				<string>)</string>
-			</array>
-			<array>
-				<string>{</string>
-				<string>}</string>
-			</array>
-			<array>
-				<string>[</string>
-				<string>]</string>
-			</array>
-			<array>
-				<string>“</string>
-				<string>”</string>
-			</array>
-			<array>
-				<string>‘</string>
-				<string>’</string>
-			</array>
-		</array>
-		<key>unIndentedLinePattern</key>
-		<string>^\s*$</string>
-	</dict>
-	<key>uuid</key>
-	<string>3E8C2307-8175-4A58-BE07-785713D5837A</string>
-</dict>
-</plist>
diff --git a/bundles/text.tmbundle/Preferences/Spell checking.plist b/bundles/text.tmbundle/Preferences/Spell checking.plist
deleted file mode 100644
index 3ef7e991a..000000000
--- a/bundles/text.tmbundle/Preferences/Spell checking.plist	
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>name</key>
-	<string>Spell Checking: Disable</string>
-	<key>scope</key>
-	<string>markup.underline.link, markup.raw</string>
-	<key>settings</key>
-	<dict>
-		<key>spellChecking</key>
-		<string>0</string>
-	</dict>
-	<key>uuid</key>
-	<string>613405D5-67B6-4281-94C9-9148E54C66FB</string>
-</dict>
-</plist>
diff --git a/bundles/text.tmbundle/Snippets/010 Copyright.plist b/bundles/text.tmbundle/Snippets/010 Copyright.plist
deleted file mode 100644
index 3d43183c1..000000000
--- a/bundles/text.tmbundle/Snippets/010 Copyright.plist	
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>(c) Copyright `date +%Y` $TM_FULLNAME. All Rights Reserved. </string>
-	<key>name</key>
-	<string>Copyright Notice</string>
-	<key>tabTrigger</key>
-	<string>c)</string>
-	<key>uuid</key>
-	<string>BC8B89E4-5F16-11D9-B9C3-000D93589AF6</string>
-</dict>
-</plist>
diff --git a/bundles/text.tmbundle/Snippets/Conitnue bullet.plist b/bundles/text.tmbundle/Snippets/Conitnue bullet.plist
deleted file mode 100644
index 4704f7906..000000000
--- a/bundles/text.tmbundle/Snippets/Conitnue bullet.plist	
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>
-• </string>
-	<key>keyEquivalent</key>
-	<string></string>
-	<key>name</key>
-	<string>Continue Bullet</string>
-	<key>scope</key>
-	<string>meta.bullet-point</string>
-	<key>uuid</key>
-	<string>C30BA263-B10E-11D9-9975-000D93589AF6</string>
-</dict>
-</plist>
diff --git a/bundles/text.tmbundle/Snippets/Conitnue light bullet.plist b/bundles/text.tmbundle/Snippets/Conitnue light bullet.plist
deleted file mode 100644
index 2c0cd2a80..000000000
--- a/bundles/text.tmbundle/Snippets/Conitnue light bullet.plist	
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>
-· </string>
-	<key>keyEquivalent</key>
-	<string></string>
-	<key>name</key>
-	<string>Continue Light Bullet</string>
-	<key>scope</key>
-	<string>meta.bullet-point.light</string>
-	<key>uuid</key>
-	<string>EA149DAB-B10E-11D9-9975-000D93589AF6</string>
-</dict>
-</plist>
diff --git a/bundles/text.tmbundle/Snippets/Conitnue star bullet.plist b/bundles/text.tmbundle/Snippets/Conitnue star bullet.plist
deleted file mode 100644
index 81dc40471..000000000
--- a/bundles/text.tmbundle/Snippets/Conitnue star bullet.plist	
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>
-* </string>
-	<key>keyEquivalent</key>
-	<string></string>
-	<key>name</key>
-	<string>Continue Star Bullet</string>
-	<key>scope</key>
-	<string>meta.bullet-point.star</string>
-	<key>uuid</key>
-	<string>B5E22191-B151-11D9-85C9-000D93589AF6</string>
-</dict>
-</plist>
diff --git a/bundles/text.tmbundle/Snippets/Insert ISO date.plist b/bundles/text.tmbundle/Snippets/Insert ISO date.plist
deleted file mode 100644
index c2b2f79b8..000000000
--- a/bundles/text.tmbundle/Snippets/Insert ISO date.plist	
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>`date +%Y-%m-%d`</string>
-	<key>name</key>
-	<string>Current Date — YYYY-MM-DD</string>
-	<key>tabTrigger</key>
-	<string>isoD</string>
-	<key>uuid</key>
-	<string>C9CAF012-6E50-11D9-AA12-000D93589AF6</string>
-</dict>
-</plist>
diff --git a/bundles/text.tmbundle/Snippets/Lorem ipsum.plist b/bundles/text.tmbundle/Snippets/Lorem ipsum.plist
deleted file mode 100644
index a30cff0d4..000000000
--- a/bundles/text.tmbundle/Snippets/Lorem ipsum.plist	
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</string>
-	<key>name</key>
-	<string>Lorem ipsum</string>
-	<key>tabTrigger</key>
-	<string>lorem</string>
-	<key>uuid</key>
-	<string>BA9A2B17-DA89-49A5-809B-AC7510C24625</string>
-</dict>
-</plist>
diff --git a/bundles/text.tmbundle/Syntaxes/Plain text.plist b/bundles/text.tmbundle/Syntaxes/Plain text.plist
deleted file mode 100644
index 58f61d336..000000000
--- a/bundles/text.tmbundle/Syntaxes/Plain text.plist	
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>fileTypes</key>
-	<array>
-		<string>txt</string>
-	</array>
-	<key>keyEquivalent</key>
-	<string>^~P</string>
-	<key>name</key>
-	<string>Plain Text</string>
-	<key>patterns</key>
-	<array>
-		<dict>
-			<key>captures</key>
-			<dict>
-				<key>1</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.item.text</string>
-				</dict>
-			</dict>
-			<key>match</key>
-			<string>^\s*(•).*$\n?</string>
-			<key>name</key>
-			<string>meta.bullet-point.strong.text</string>
-		</dict>
-		<dict>
-			<key>captures</key>
-			<dict>
-				<key>1</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.item.text</string>
-				</dict>
-			</dict>
-			<key>match</key>
-			<string>^\s*(·).*$\n?</string>
-			<key>name</key>
-			<string>meta.bullet-point.light.text</string>
-		</dict>
-		<dict>
-			<key>captures</key>
-			<dict>
-				<key>1</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.item.text</string>
-				</dict>
-			</dict>
-			<key>match</key>
-			<string>^\s*(\*).*$\n?</string>
-			<key>name</key>
-			<string>meta.bullet-point.star.text</string>
-		</dict>
-		<dict>
-			<key>begin</key>
-			<string>^([ \t]*)(?=\S)</string>
-			<key>contentName</key>
-			<string>meta.paragraph.text</string>
-			<key>end</key>
-			<string>^(?!\1(?=\S))</string>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>match</key>
-					<string>(?x)
-						( (https?|s?ftp|ftps|file|smb|afp|nfs|(x-)?man|gopher|txmt)://|mailto:)
-						[-:@a-zA-Z0-9_.,~%+/?=&amp;#]+(?&lt;![.,?:])
-					</string>
-					<key>name</key>
-					<string>markup.underline.link.text</string>
-				</dict>
-			</array>
-		</dict>
-	</array>
-	<key>scopeName</key>
-	<string>text.plain</string>
-	<key>uuid</key>
-	<string>3130E4FA-B10E-11D9-9F75-000D93589AF6</string>
-</dict>
-</plist>
diff --git a/bundles/text.tmbundle/Templates/Empty file/info.plist b/bundles/text.tmbundle/Templates/Empty file/info.plist
deleted file mode 100644
index 5b2b2ffb5..000000000
--- a/bundles/text.tmbundle/Templates/Empty file/info.plist	
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>command</key>
-	<string>touch "$TM_NEW_FILE"</string>
-	<key>isDefault</key>
-	<string>1</string>
-	<key>name</key>
-	<string>Empty File</string>
-	<key>uuid</key>
-	<string>2D3AFF01-6DFB-11D9-91EB-000D93589AF6</string>
-</dict>
-</plist>
diff --git a/bundles/text.tmbundle/Templates/From Clipboard/info.plist b/bundles/text.tmbundle/Templates/From Clipboard/info.plist
deleted file mode 100644
index 54da778e6..000000000
--- a/bundles/text.tmbundle/Templates/From Clipboard/info.plist	
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>command</key>
-	<string>if [[ ! -f "$TM_NEW_FILE" ]]; then
-   __CF_USER_TEXT_ENCODING=$UID:0x8000100:0x8000100 \
-   pbpaste &gt; "$TM_NEW_FILE" | tr '\r' '\n'
-fi</string>
-	<key>extension</key>
-	<string>txt</string>
-	<key>name</key>
-	<string>From Clipboard</string>
-	<key>uuid</key>
-	<string>1D357AB2-687A-4C74-AADE-6AE6684E97DC</string>
-</dict>
-</plist>
diff --git a/bundles/text.tmbundle/info.plist b/bundles/text.tmbundle/info.plist
deleted file mode 100644
index 13b08e097..000000000
--- a/bundles/text.tmbundle/info.plist
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>contactEmailRot13</key>
-	<string>gz-ohaqyrf@znpebzngrf.pbz</string>
-	<key>contactName</key>
-	<string>Allan Odgaard</string>
-	<key>deleted</key>
-	<array>
-		<string>CF8570E4-389B-4928-8908-BF3B6A5E8422</string>
-	</array>
-	<key>description</key>
-	<string>The text bundle has a lot of support for plain text and is a requisite for working with text.</string>
-	<key>mainMenu</key>
-	<dict>
-		<key>excludedItems</key>
-		<array>
-			<string>5A08E461-05CC-4C03-9DC8-BF118594EA3E</string>
-			<string>C30BA263-B10E-11D9-9975-000D93589AF6</string>
-			<string>EA149DAB-B10E-11D9-9975-000D93589AF6</string>
-			<string>B5E22191-B151-11D9-85C9-000D93589AF6</string>
-			<string>80CC504F-B13B-11D9-B41F-000D93589AF6</string>
-			<string>E86C9A77-5B48-43C6-A712-A61B616269E6</string>
-			<string>F22BEB71-2DE3-4183-BB10-0199CC328169</string>
-		</array>
-		<key>items</key>
-		<array>
-			<string>818D10A3-F827-424A-BCBF-6DC6CB62966A</string>
-			<string>DAF7B200-5B75-4999-BBC3-D1ADD64E1FA1</string>
-			<string>172F6528-7561-44FC-BFAD-A06C645D5AFB</string>
-			<string>4D6C0A7A-263C-4E2E-B2F2-1FA912E14490</string>
-			<string>------------------------------------</string>
-			<string>FB8960DB-AA2E-11D9-8E27-000D93589AF6</string>
-			<string>C46A9DBC-0B06-49DF-838B-491B529ECF22</string>
-			<string>3D7504EE-B927-4D3D-A3CC-BFB189027EE7</string>
-			<string>------------------------------------</string>
-			<string>8085013F-8DEA-11D9-B421-000D93589AF6</string>
-			<string>AA202E76-8A0A-11D9-B85D-000D93589AF6</string>
-			<string>------------------------------------</string>
-			<string>BC8B89E4-5F16-11D9-B9C3-000D93589AF6</string>
-			<string>C9CAF012-6E50-11D9-AA12-000D93589AF6</string>
-			<string>BA9A2B17-DA89-49A5-809B-AC7510C24625</string>
-			<string>D26BEEE3-7439-4B7E-AD9D-9A144CDC5873</string>
-		</array>
-		<key>submenus</key>
-		<dict>
-			<key>172F6528-7561-44FC-BFAD-A06C645D5AFB</key>
-			<dict>
-				<key>items</key>
-				<array>
-					<string>DA5AD0D9-F7C0-4010-9FDC-FF01B0434F9A</string>
-					<string>965DF29E-4EBD-457A-9A61-56D920C35F72</string>
-					<string>8109F2C2-FF63-46F7-83F3-D2318290FC11</string>
-				</array>
-				<key>name</key>
-				<string>Filtering</string>
-			</dict>
-			<key>4D6C0A7A-263C-4E2E-B2F2-1FA912E14490</key>
-			<dict>
-				<key>items</key>
-				<array>
-					<string>273853DF-6E4F-11D9-A18D-000D93589AF6</string>
-					<string>3010E2A8-6E4F-11D9-A18D-000D93589AF6</string>
-					<string>------------------------------------</string>
-					<string>90291A6E-34F6-4FD5-BA82-6BB6FB4DD492</string>
-				</array>
-				<key>name</key>
-				<string>Sorting</string>
-			</dict>
-			<key>818D10A3-F827-424A-BCBF-6DC6CB62966A</key>
-			<dict>
-				<key>items</key>
-				<array>
-					<string>7C9736B2-B851-11D9-B05D-00039369B986</string>
-					<string>0F8C1F78-6E4C-11D9-91AF-000D93589AF6</string>
-					<string>BEC25DC3-6E4B-11D9-91AF-000D93589AF6</string>
-					<string>3AA8A593-6E4C-11D9-91AF-000D93589AF6</string>
-				</array>
-				<key>name</key>
-				<string>Converting / Stripping</string>
-			</dict>
-			<key>DAF7B200-5B75-4999-BBC3-D1ADD64E1FA1</key>
-			<dict>
-				<key>items</key>
-				<array>
-					<string>D39DC176-BC8D-11D9-8946-000D93589AF6</string>
-					<string>4B22577B-BC8E-11D9-8946-000D93589AF6</string>
-				</array>
-				<key>name</key>
-				<string>Encryption</string>
-			</dict>
-		</dict>
-	</dict>
-	<key>name</key>
-	<string>Text</string>
-	<key>ordering</key>
-	<array>
-		<string>8085013F-8DEA-11D9-B421-000D93589AF6</string>
-		<string>D39DC176-BC8D-11D9-8946-000D93589AF6</string>
-		<string>4B22577B-BC8E-11D9-8946-000D93589AF6</string>
-		<string>7C9736B2-B851-11D9-B05D-00039369B986</string>
-		<string>C46A9DBC-0B06-49DF-838B-491B529ECF22</string>
-		<string>5A08E461-05CC-4C03-9DC8-BF118594EA3E</string>
-		<string>0F8C1F78-6E4C-11D9-91AF-000D93589AF6</string>
-		<string>BEC25DC3-6E4B-11D9-91AF-000D93589AF6</string>
-		<string>273853DF-6E4F-11D9-A18D-000D93589AF6</string>
-		<string>3010E2A8-6E4F-11D9-A18D-000D93589AF6</string>
-		<string>90291A6E-34F6-4FD5-BA82-6BB6FB4DD492</string>
-		<string>AA202E76-8A0A-11D9-B85D-000D93589AF6</string>
-		<string>3AA8A593-6E4C-11D9-91AF-000D93589AF6</string>
-		<string>D26BEEE3-7439-4B7E-AD9D-9A144CDC5873</string>
-		<string>965DF29E-4EBD-457A-9A61-56D920C35F72</string>
-		<string>8109F2C2-FF63-46F7-83F3-D2318290FC11</string>
-		<string>DA5AD0D9-F7C0-4010-9FDC-FF01B0434F9A</string>
-		<string>FB8960DB-AA2E-11D9-8E27-000D93589AF6</string>
-		<string>3D7504EE-B927-4D3D-A3CC-BFB189027EE7</string>
-		<string>80CC504F-B13B-11D9-B41F-000D93589AF6</string>
-		<string>E86C9A77-5B48-43C6-A712-A61B616269E6</string>
-		<string>F22BEB71-2DE3-4183-BB10-0199CC328169</string>
-		<string>C30BA263-B10E-11D9-9975-000D93589AF6</string>
-		<string>EA149DAB-B10E-11D9-9975-000D93589AF6</string>
-		<string>B5E22191-B151-11D9-85C9-000D93589AF6</string>
-		<string>BC8B89E4-5F16-11D9-B9C3-000D93589AF6</string>
-		<string>C9CAF012-6E50-11D9-AA12-000D93589AF6</string>
-		<string>BA9A2B17-DA89-49A5-809B-AC7510C24625</string>
-		<string>3130E4FA-B10E-11D9-9F75-000D93589AF6</string>
-		<string>3E8C2307-8175-4A58-BE07-785713D5837A</string>
-		<string>613405D5-67B6-4281-94C9-9148E54C66FB</string>
-		<string>A088E2CA-03E7-4A8C-855C-AC954E739D6D</string>
-		<string>2EE6D01F-50BC-434B-BE45-54D29CACB3E0</string>
-		<string>4CCD8369-40E4-422A-ABE7-C32F3721AFEF</string>
-		<string>2D3AFF01-6DFB-11D9-91EB-000D93589AF6</string>
-		<string>1D357AB2-687A-4C74-AADE-6AE6684E97DC</string>
-	</array>
-	<key>uuid</key>
-	<string>B7BC3FFD-6E4B-11D9-91AF-000D93589AF6</string>
-</dict>
-</plist>