0
@@ -13,13 +13,13 @@ Git.tmbundle:
0
   branch: master
0
   squash: true
0
   remote: git://github.com/timcharper/git-tmbundle.git
0
-GitHub.tmbundle: 
0
-  local_branch: braid/git/GitHub.tmbundle/master
0
+ruby-shoulda-tmbundle: 
0
+  local_branch: braid/git/ruby-shoulda-tmbundle/master
0
   type: git
0
   revision: 
0
   branch: master
0
   squash: true
0
-  remote: git://github.com/drnic/github-tmbundle.git
0
+  remote: git://github.com/drnic/ruby-shoulda-tmbundle.git
0
 ruby-on-rails-tmbundle: 
0
   local_branch: braid/git/ruby-on-rails-tmbundle/master
0
   type: git
0
@@ -27,20 +27,13 @@ ruby-on-rails-tmbundle:
0
   branch: master
0
   squash: true
0
   remote: git://github.com/drnic/ruby-on-rails-tmbundle.git
0
-ruby-shoulda-tmbundle: 
0
-  local_branch: braid/git/ruby-shoulda-tmbundle/master
0
-  type: git
0
-  revision: 
0
-  branch: master
0
-  squash: true
0
-  remote: git://github.com/drnic/ruby-shoulda-tmbundle.git
0
-copy-as-rtf-tmbundle: 
0
-  local_branch: braid/git/copy-as-rtf-tmbundle/master
0
+GitHub.tmbundle: 
0
+  local_branch: braid/git/GitHub.tmbundle/master
0
   type: git
0
   revision: 
0
   branch: master
0
   squash: true
0
-  remote: git://github.com/drnic/copy-as-rtf-tmbundle.git
0
+  remote: git://github.com/drnic/github-tmbundle.git
0
 javascript-unittest-tmbundle: 
0
   local_branch: braid/git/javascript-unittest-tmbundle/master
0
   type: git
0
@@ -48,16 +41,23 @@ javascript-unittest-tmbundle:
0
   branch: master
0
   squash: true
0
   remote: git://github.com/drnic/javascript-unittest-tmbundle.git
0
-HTML.tmbundle: 
0
-  local_branch: braid/git/HTML.tmbundle/master
0
+copy-as-rtf-tmbundle: 
0
+  local_branch: braid/git/copy-as-rtf-tmbundle/master
0
   type: git
0
   revision: 
0
   branch: master
0
   squash: true
0
-  remote: git://github.com/drnic/html-tmbundle.git
0
+  remote: git://github.com/drnic/copy-as-rtf-tmbundle.git
0
 ActionScript.tmbundle: 
0
   local_branch: braid/svn/ActionScript.tmbundle
0
   type: svn
0
   revision: 
0
   squash: true
0
   remote: http://anon:anon@macromates.com/svn/Bundles/trunk/Bundles/ActionScript.tmbundle
0
+HTML.tmbundle: 
0
+  local_branch: braid/git/HTML.tmbundle/master
0
+  type: git
0
+  revision: 
0
+  branch: master
0
+  squash: true
0
+  remote: git://github.com/drnic/html-tmbundle.git

0
@@ -42,7 +42,7 @@
0
     |   [#] .*? \(end\) \s*+ $    # Sune’s special marker
0
     )</string>
0
   <key>keyEquivalent</key>
0
-	<string>^~R</string>
0
+	<string>^@e</string>
0
   <key>name</key>
0
   <string>Ruby on Rails</string>
0
   <key>patterns</key>
0
@@ -265,6 +265,12 @@
0
     </dict>
0
     <dict>
0
       <key>match</key>
0
+			<string>\b(check_box|content_for|error_messages_for|form_for|fields_for|file_field|hidden_field|image_submit_tag|label|link_to|password_field|radio_button|submit|text_field|text_area)\b</string>
0
+			<key>name</key>
0
+			<string>support.function.viewhelpers.rails</string>
0
+		</dict>
0
+		<dict>
0
+			<key>match</key>
0
       <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>
0
       <key>name</key>
0
       <string>support.function.activerecord.rails</string>

0
@@ -712,6 +712,7 @@
0
     <string>9ECBF20C-003E-41D9-A881-4BAC0656F9DC</string>
0
     <string>7D99041D-C3B7-4940-AE64-6B1758CDB47C</string>
0
     <string>15BDD7B6-5C15-4684-93C7-A05E3D2221AC</string>
0
+		<string>7C7FC66A-D566-40D3-B9DA-FCEA4EFF98C6</string>
0
     <string>402C251E-595B-4A58-8EB9-41989040F280</string>
0
     <string>B31822D9-2048-4D16-B2AF-00E0B4E5C368</string>
0
     <string>CC1BCD1C-2479-4335-B511-17B880316A75</string>