diff --git a/sublime/Packages/CSS/css_completions (Hackintosh's conflicted copy 2012-07-24).pyc b/sublime/Packages/CSS/css_completions (Hackintosh's conflicted copy 2012-07-24).pyc
deleted file mode 100644
index dcc764f..0000000
Binary files a/sublime/Packages/CSS/css_completions (Hackintosh's conflicted copy 2012-07-24).pyc and /dev/null differ
diff --git a/sublime/Packages/D/Symbol List-Method-Constructor.tmPreferences (Hackintosh's conflicted copy 2012-07-23).cache b/sublime/Packages/D/Symbol List-Method-Constructor.tmPreferences (Hackintosh's conflicted copy 2012-07-23).cache
deleted file mode 100644
index 8541a9e..0000000
Binary files a/sublime/Packages/D/Symbol List-Method-Constructor.tmPreferences (Hackintosh's conflicted copy 2012-07-23).cache and /dev/null differ
diff --git a/sublime/Packages/Default/Meta Info Summary (Hackintosh's conflicted copy 2012-07-24).cache b/sublime/Packages/Default/Meta Info Summary (Hackintosh's conflicted copy 2012-07-24).cache
deleted file mode 100644
index d552982..0000000
Binary files a/sublime/Packages/Default/Meta Info Summary (Hackintosh's conflicted copy 2012-07-24).cache and /dev/null differ
diff --git a/sublime/Packages/Default/Meta Info Summary (Ruxton's conflicted copy 2012-07-23).cache b/sublime/Packages/Default/Meta Info Summary (Ruxton's conflicted copy 2012-07-23).cache
deleted file mode 100644
index fd370d3..0000000
Binary files a/sublime/Packages/Default/Meta Info Summary (Ruxton's conflicted copy 2012-07-23).cache and /dev/null differ
diff --git a/sublime/Packages/Default/Startup (Hackintosh's conflicted copy 2012-07-23).cache b/sublime/Packages/Default/Startup (Hackintosh's conflicted copy 2012-07-23).cache
deleted file mode 100644
index 2195ace..0000000
Binary files a/sublime/Packages/Default/Startup (Hackintosh's conflicted copy 2012-07-23).cache and /dev/null differ
diff --git a/sublime/Packages/Default/Startup (Hackintosh's conflicted copy 2012-07-24).cache b/sublime/Packages/Default/Startup (Hackintosh's conflicted copy 2012-07-24).cache
deleted file mode 100644
index 521394d..0000000
Binary files a/sublime/Packages/Default/Startup (Hackintosh's conflicted copy 2012-07-24).cache and /dev/null differ
diff --git a/sublime/Packages/Default/Startup.cache b/sublime/Packages/Default/Startup.cache
index 9021f6d..0df0445 100644
Binary files a/sublime/Packages/Default/Startup.cache and b/sublime/Packages/Default/Startup.cache differ
diff --git a/sublime/Packages/Default/Syntax Summary (Hackintosh's conflicted copy 2012-07-23).cache b/sublime/Packages/Default/Syntax Summary (Hackintosh's conflicted copy 2012-07-23).cache
deleted file mode 100644
index 49d62d8..0000000
Binary files a/sublime/Packages/Default/Syntax Summary (Hackintosh's conflicted copy 2012-07-23).cache and /dev/null differ
diff --git a/sublime/Packages/Default/Syntax Summary (Hackintosh's conflicted copy 2012-07-24).cache b/sublime/Packages/Default/Syntax Summary (Hackintosh's conflicted copy 2012-07-24).cache
deleted file mode 100644
index cdec137..0000000
Binary files a/sublime/Packages/Default/Syntax Summary (Hackintosh's conflicted copy 2012-07-24).cache and /dev/null differ
diff --git a/sublime/Packages/Default/comment (Hackintosh's conflicted copy 2012-07-24).pyc b/sublime/Packages/Default/comment (Hackintosh's conflicted copy 2012-07-24).pyc
deleted file mode 100644
index d9752f3..0000000
Binary files a/sublime/Packages/Default/comment (Hackintosh's conflicted copy 2012-07-24).pyc and /dev/null differ
diff --git a/sublime/Packages/Default/comment (Ruxton's conflicted copy 2012-07-23).pyc b/sublime/Packages/Default/comment (Ruxton's conflicted copy 2012-07-23).pyc
deleted file mode 100644
index d4082df..0000000
Binary files a/sublime/Packages/Default/comment (Ruxton's conflicted copy 2012-07-23).pyc and /dev/null differ
diff --git a/sublime/Packages/Default/copy_path (Hackintosh's conflicted copy 2012-07-23).pyc b/sublime/Packages/Default/copy_path (Hackintosh's conflicted copy 2012-07-23).pyc
deleted file mode 100644
index bcff622..0000000
Binary files a/sublime/Packages/Default/copy_path (Hackintosh's conflicted copy 2012-07-23).pyc and /dev/null differ
diff --git a/sublime/Packages/Default/copy_path (Hackintosh's conflicted copy 2012-07-24).pyc b/sublime/Packages/Default/copy_path (Hackintosh's conflicted copy 2012-07-24).pyc
deleted file mode 100644
index bcff622..0000000
Binary files a/sublime/Packages/Default/copy_path (Hackintosh's conflicted copy 2012-07-24).pyc and /dev/null differ
diff --git a/sublime/Packages/Default/delete_word (Hackintosh's conflicted copy 2012-07-23).pyc b/sublime/Packages/Default/delete_word (Hackintosh's conflicted copy 2012-07-23).pyc
deleted file mode 100644
index df44ed0..0000000
Binary files a/sublime/Packages/Default/delete_word (Hackintosh's conflicted copy 2012-07-23).pyc and /dev/null differ
diff --git a/sublime/Packages/Default/delete_word (Hackintosh's conflicted copy 2012-07-24).pyc b/sublime/Packages/Default/delete_word (Hackintosh's conflicted copy 2012-07-24).pyc
deleted file mode 100644
index df44ed0..0000000
Binary files a/sublime/Packages/Default/delete_word (Hackintosh's conflicted copy 2012-07-24).pyc and /dev/null differ
diff --git a/sublime/Packages/Default/detect_indentation (Hackintosh's conflicted copy 2012-07-23).pyc b/sublime/Packages/Default/detect_indentation (Hackintosh's conflicted copy 2012-07-23).pyc
deleted file mode 100644
index ea50b1e..0000000
Binary files a/sublime/Packages/Default/detect_indentation (Hackintosh's conflicted copy 2012-07-23).pyc and /dev/null differ
diff --git a/sublime/Packages/Default/detect_indentation (Hackintosh's conflicted copy 2012-07-24).pyc b/sublime/Packages/Default/detect_indentation (Hackintosh's conflicted copy 2012-07-24).pyc
deleted file mode 100644
index ea50b1e..0000000
Binary files a/sublime/Packages/Default/detect_indentation (Hackintosh's conflicted copy 2012-07-24).pyc and /dev/null differ
diff --git a/sublime/Packages/Default/duplicate_line (Hackintosh's conflicted copy 2012-07-23).pyc b/sublime/Packages/Default/duplicate_line (Hackintosh's conflicted copy 2012-07-23).pyc
deleted file mode 100644
index 4b561a5..0000000
Binary files a/sublime/Packages/Default/duplicate_line (Hackintosh's conflicted copy 2012-07-23).pyc and /dev/null differ
diff --git a/sublime/Packages/Default/duplicate_line (Hackintosh's conflicted copy 2012-07-24).pyc b/sublime/Packages/Default/duplicate_line (Hackintosh's conflicted copy 2012-07-24).pyc
deleted file mode 100644
index 4b561a5..0000000
Binary files a/sublime/Packages/Default/duplicate_line (Hackintosh's conflicted copy 2012-07-24).pyc and /dev/null differ
diff --git a/sublime/Packages/Default/echo (Hackintosh's conflicted copy 2012-07-23).pyc b/sublime/Packages/Default/echo (Hackintosh's conflicted copy 2012-07-23).pyc
deleted file mode 100644
index 567f536..0000000
Binary files a/sublime/Packages/Default/echo (Hackintosh's conflicted copy 2012-07-23).pyc and /dev/null differ
diff --git a/sublime/Packages/Default/echo (Hackintosh's conflicted copy 2012-07-24).pyc b/sublime/Packages/Default/echo (Hackintosh's conflicted copy 2012-07-24).pyc
deleted file mode 100644
index 567f536..0000000
Binary files a/sublime/Packages/Default/echo (Hackintosh's conflicted copy 2012-07-24).pyc and /dev/null differ
diff --git a/sublime/Packages/Default/exec (Hackintosh's conflicted copy 2012-07-24).pyc b/sublime/Packages/Default/exec (Hackintosh's conflicted copy 2012-07-24).pyc
deleted file mode 100644
index 7948afe..0000000
Binary files a/sublime/Packages/Default/exec (Hackintosh's conflicted copy 2012-07-24).pyc and /dev/null differ
diff --git a/sublime/Packages/Default/exec (Ruxton's conflicted copy 2012-07-23).pyc b/sublime/Packages/Default/exec (Ruxton's conflicted copy 2012-07-23).pyc
deleted file mode 100644
index 320eb4d..0000000
Binary files a/sublime/Packages/Default/exec (Ruxton's conflicted copy 2012-07-23).pyc and /dev/null differ
diff --git a/sublime/Packages/Default/fold (Hackintosh's conflicted copy 2012-07-23).pyc b/sublime/Packages/Default/fold (Hackintosh's conflicted copy 2012-07-23).pyc
deleted file mode 100644
index 694fe37..0000000
Binary files a/sublime/Packages/Default/fold (Hackintosh's conflicted copy 2012-07-23).pyc and /dev/null differ
diff --git a/sublime/Packages/Default/fold (Hackintosh's conflicted copy 2012-07-24).pyc b/sublime/Packages/Default/fold (Hackintosh's conflicted copy 2012-07-24).pyc
deleted file mode 100644
index 694fe37..0000000
Binary files a/sublime/Packages/Default/fold (Hackintosh's conflicted copy 2012-07-24).pyc and /dev/null differ
diff --git a/sublime/Packages/Default/font (Hackintosh's conflicted copy 2012-07-23).pyc b/sublime/Packages/Default/font (Hackintosh's conflicted copy 2012-07-23).pyc
deleted file mode 100644
index 01e7efb..0000000
Binary files a/sublime/Packages/Default/font (Hackintosh's conflicted copy 2012-07-23).pyc and /dev/null differ
diff --git a/sublime/Packages/Default/font (Hackintosh's conflicted copy 2012-07-24).pyc b/sublime/Packages/Default/font (Hackintosh's conflicted copy 2012-07-24).pyc
deleted file mode 100644
index 01e7efb..0000000
Binary files a/sublime/Packages/Default/font (Hackintosh's conflicted copy 2012-07-24).pyc and /dev/null differ
diff --git a/sublime/Packages/Default/goto_line (Hackintosh's conflicted copy 2012-07-23).pyc b/sublime/Packages/Default/goto_line (Hackintosh's conflicted copy 2012-07-23).pyc
deleted file mode 100644
index ed176ef..0000000
Binary files a/sublime/Packages/Default/goto_line (Hackintosh's conflicted copy 2012-07-23).pyc and /dev/null differ
diff --git a/sublime/Packages/Default/goto_line (Hackintosh's conflicted copy 2012-07-24).pyc b/sublime/Packages/Default/goto_line (Hackintosh's conflicted copy 2012-07-24).pyc
deleted file mode 100644
index ed176ef..0000000
Binary files a/sublime/Packages/Default/goto_line (Hackintosh's conflicted copy 2012-07-24).pyc and /dev/null differ
diff --git a/sublime/Packages/Default/indentation (Hackintosh's conflicted copy 2012-07-23).pyc b/sublime/Packages/Default/indentation (Hackintosh's conflicted copy 2012-07-23).pyc
deleted file mode 100644
index 0e4dd5c..0000000
Binary files a/sublime/Packages/Default/indentation (Hackintosh's conflicted copy 2012-07-23).pyc and /dev/null differ
diff --git a/sublime/Packages/Default/indentation (Hackintosh's conflicted copy 2012-07-24).pyc b/sublime/Packages/Default/indentation (Hackintosh's conflicted copy 2012-07-24).pyc
deleted file mode 100644
index 0e4dd5c..0000000
Binary files a/sublime/Packages/Default/indentation (Hackintosh's conflicted copy 2012-07-24).pyc and /dev/null differ
diff --git a/sublime/Packages/Default/kill_ring (Hackintosh's conflicted copy 2012-07-23).pyc b/sublime/Packages/Default/kill_ring (Hackintosh's conflicted copy 2012-07-23).pyc
deleted file mode 100644
index 2382394..0000000
Binary files a/sublime/Packages/Default/kill_ring (Hackintosh's conflicted copy 2012-07-23).pyc and /dev/null differ
diff --git a/sublime/Packages/Default/kill_ring (Hackintosh's conflicted copy 2012-07-24).pyc b/sublime/Packages/Default/kill_ring (Hackintosh's conflicted copy 2012-07-24).pyc
deleted file mode 100644
index 2382394..0000000
Binary files a/sublime/Packages/Default/kill_ring (Hackintosh's conflicted copy 2012-07-24).pyc and /dev/null differ
diff --git a/sublime/Packages/Default/mark (Hackintosh's conflicted copy 2012-07-23).pyc b/sublime/Packages/Default/mark (Hackintosh's conflicted copy 2012-07-23).pyc
deleted file mode 100644
index f56509a..0000000
Binary files a/sublime/Packages/Default/mark (Hackintosh's conflicted copy 2012-07-23).pyc and /dev/null differ
diff --git a/sublime/Packages/Default/mark (Hackintosh's conflicted copy 2012-07-24).pyc b/sublime/Packages/Default/mark (Hackintosh's conflicted copy 2012-07-24).pyc
deleted file mode 100644
index f56509a..0000000
Binary files a/sublime/Packages/Default/mark (Hackintosh's conflicted copy 2012-07-24).pyc and /dev/null differ
diff --git a/sublime/Packages/Default/new_templates (Hackintosh's conflicted copy 2012-07-23).pyc b/sublime/Packages/Default/new_templates (Hackintosh's conflicted copy 2012-07-23).pyc
deleted file mode 100644
index 9e3c512..0000000
Binary files a/sublime/Packages/Default/new_templates (Hackintosh's conflicted copy 2012-07-23).pyc and /dev/null differ
diff --git a/sublime/Packages/Default/new_templates (Hackintosh's conflicted copy 2012-07-24).pyc b/sublime/Packages/Default/new_templates (Hackintosh's conflicted copy 2012-07-24).pyc
deleted file mode 100644
index 9e3c512..0000000
Binary files a/sublime/Packages/Default/new_templates (Hackintosh's conflicted copy 2012-07-24).pyc and /dev/null differ
diff --git a/sublime/Packages/Default/open_file_settings (Hackintosh's conflicted copy 2012-07-23).pyc b/sublime/Packages/Default/open_file_settings (Hackintosh's conflicted copy 2012-07-23).pyc
deleted file mode 100644
index 56de618..0000000
Binary files a/sublime/Packages/Default/open_file_settings (Hackintosh's conflicted copy 2012-07-23).pyc and /dev/null differ
diff --git a/sublime/Packages/Default/open_file_settings (Hackintosh's conflicted copy 2012-07-24).pyc b/sublime/Packages/Default/open_file_settings (Hackintosh's conflicted copy 2012-07-24).pyc
deleted file mode 100644
index 56de618..0000000
Binary files a/sublime/Packages/Default/open_file_settings (Hackintosh's conflicted copy 2012-07-24).pyc and /dev/null differ
diff --git a/sublime/Packages/Default/open_in_browser (Hackintosh's conflicted copy 2012-07-23).pyc b/sublime/Packages/Default/open_in_browser (Hackintosh's conflicted copy 2012-07-23).pyc
deleted file mode 100644
index d168bd6..0000000
Binary files a/sublime/Packages/Default/open_in_browser (Hackintosh's conflicted copy 2012-07-23).pyc and /dev/null differ
diff --git a/sublime/Packages/Default/open_in_browser (Hackintosh's conflicted copy 2012-07-24).pyc b/sublime/Packages/Default/open_in_browser (Hackintosh's conflicted copy 2012-07-24).pyc
deleted file mode 100644
index d168bd6..0000000
Binary files a/sublime/Packages/Default/open_in_browser (Hackintosh's conflicted copy 2012-07-24).pyc and /dev/null differ
diff --git a/sublime/Packages/Default/paragraph (Hackintosh's conflicted copy 2012-07-23).pyc b/sublime/Packages/Default/paragraph (Hackintosh's conflicted copy 2012-07-23).pyc
deleted file mode 100644
index be31abf..0000000
Binary files a/sublime/Packages/Default/paragraph (Hackintosh's conflicted copy 2012-07-23).pyc and /dev/null differ
diff --git a/sublime/Packages/Default/paragraph (Hackintosh's conflicted copy 2012-07-24).pyc b/sublime/Packages/Default/paragraph (Hackintosh's conflicted copy 2012-07-24).pyc
deleted file mode 100644
index be31abf..0000000
Binary files a/sublime/Packages/Default/paragraph (Hackintosh's conflicted copy 2012-07-24).pyc and /dev/null differ
diff --git a/sublime/Packages/Default/save_on_focus_lost (Hackintosh's conflicted copy 2012-07-23).pyc b/sublime/Packages/Default/save_on_focus_lost (Hackintosh's conflicted copy 2012-07-23).pyc
deleted file mode 100644
index b0ed0b5..0000000
Binary files a/sublime/Packages/Default/save_on_focus_lost (Hackintosh's conflicted copy 2012-07-23).pyc and /dev/null differ
diff --git a/sublime/Packages/Default/save_on_focus_lost (Hackintosh's conflicted copy 2012-07-24).pyc b/sublime/Packages/Default/save_on_focus_lost (Hackintosh's conflicted copy 2012-07-24).pyc
deleted file mode 100644
index b0ed0b5..0000000
Binary files a/sublime/Packages/Default/save_on_focus_lost (Hackintosh's conflicted copy 2012-07-24).pyc and /dev/null differ
diff --git a/sublime/Packages/Default/scroll (Hackintosh's conflicted copy 2012-07-23).pyc b/sublime/Packages/Default/scroll (Hackintosh's conflicted copy 2012-07-23).pyc
deleted file mode 100644
index a93efba..0000000
Binary files a/sublime/Packages/Default/scroll (Hackintosh's conflicted copy 2012-07-23).pyc and /dev/null differ
diff --git a/sublime/Packages/Default/scroll (Hackintosh's conflicted copy 2012-07-24).pyc b/sublime/Packages/Default/scroll (Hackintosh's conflicted copy 2012-07-24).pyc
deleted file mode 100644
index a93efba..0000000
Binary files a/sublime/Packages/Default/scroll (Hackintosh's conflicted copy 2012-07-24).pyc and /dev/null differ
diff --git a/sublime/Packages/Default/send2trash/__init__ (Hackintosh's conflicted copy 2012-07-23).pyc b/sublime/Packages/Default/send2trash/__init__ (Hackintosh's conflicted copy 2012-07-23).pyc
deleted file mode 100644
index e116a0c..0000000
Binary files a/sublime/Packages/Default/send2trash/__init__ (Hackintosh's conflicted copy 2012-07-23).pyc and /dev/null differ
diff --git a/sublime/Packages/Default/send2trash/__init__ (Hackintosh's conflicted copy 2012-07-24).pyc b/sublime/Packages/Default/send2trash/__init__ (Hackintosh's conflicted copy 2012-07-24).pyc
deleted file mode 100644
index e116a0c..0000000
Binary files a/sublime/Packages/Default/send2trash/__init__ (Hackintosh's conflicted copy 2012-07-24).pyc and /dev/null differ
diff --git a/sublime/Packages/Default/send2trash/plat_osx (Hackintosh's conflicted copy 2012-07-23).pyc b/sublime/Packages/Default/send2trash/plat_osx (Hackintosh's conflicted copy 2012-07-23).pyc
deleted file mode 100644
index 918daa5..0000000
Binary files a/sublime/Packages/Default/send2trash/plat_osx (Hackintosh's conflicted copy 2012-07-23).pyc and /dev/null differ
diff --git a/sublime/Packages/Default/send2trash/plat_osx (Hackintosh's conflicted copy 2012-07-24).pyc b/sublime/Packages/Default/send2trash/plat_osx (Hackintosh's conflicted copy 2012-07-24).pyc
deleted file mode 100644
index 918daa5..0000000
Binary files a/sublime/Packages/Default/send2trash/plat_osx (Hackintosh's conflicted copy 2012-07-24).pyc and /dev/null differ
diff --git a/sublime/Packages/Default/set_unsaved_view_name (Hackintosh's conflicted copy 2012-07-23).pyc b/sublime/Packages/Default/set_unsaved_view_name (Hackintosh's conflicted copy 2012-07-23).pyc
deleted file mode 100644
index 99fb214..0000000
Binary files a/sublime/Packages/Default/set_unsaved_view_name (Hackintosh's conflicted copy 2012-07-23).pyc and /dev/null differ
diff --git a/sublime/Packages/Default/set_unsaved_view_name (Hackintosh's conflicted copy 2012-07-24).pyc b/sublime/Packages/Default/set_unsaved_view_name (Hackintosh's conflicted copy 2012-07-24).pyc
deleted file mode 100644
index 99fb214..0000000
Binary files a/sublime/Packages/Default/set_unsaved_view_name (Hackintosh's conflicted copy 2012-07-24).pyc and /dev/null differ
diff --git a/sublime/Packages/Default/side_bar (Hackintosh's conflicted copy 2012-07-23).pyc b/sublime/Packages/Default/side_bar (Hackintosh's conflicted copy 2012-07-23).pyc
deleted file mode 100644
index 2824c50..0000000
Binary files a/sublime/Packages/Default/side_bar (Hackintosh's conflicted copy 2012-07-23).pyc and /dev/null differ
diff --git a/sublime/Packages/Default/side_bar (Hackintosh's conflicted copy 2012-07-24).pyc b/sublime/Packages/Default/side_bar (Hackintosh's conflicted copy 2012-07-24).pyc
deleted file mode 100644
index 2824c50..0000000
Binary files a/sublime/Packages/Default/side_bar (Hackintosh's conflicted copy 2012-07-24).pyc and /dev/null differ
diff --git a/sublime/Packages/Default/sort (Hackintosh's conflicted copy 2012-07-23).pyc b/sublime/Packages/Default/sort (Hackintosh's conflicted copy 2012-07-23).pyc
deleted file mode 100644
index 37e8c45..0000000
Binary files a/sublime/Packages/Default/sort (Hackintosh's conflicted copy 2012-07-23).pyc and /dev/null differ
diff --git a/sublime/Packages/Default/sort (Hackintosh's conflicted copy 2012-07-24).pyc b/sublime/Packages/Default/sort (Hackintosh's conflicted copy 2012-07-24).pyc
deleted file mode 100644
index 37e8c45..0000000
Binary files a/sublime/Packages/Default/sort (Hackintosh's conflicted copy 2012-07-24).pyc and /dev/null differ
diff --git a/sublime/Packages/Default/swap_line (Hackintosh's conflicted copy 2012-07-23).pyc b/sublime/Packages/Default/swap_line (Hackintosh's conflicted copy 2012-07-23).pyc
deleted file mode 100644
index 3151553..0000000
Binary files a/sublime/Packages/Default/swap_line (Hackintosh's conflicted copy 2012-07-23).pyc and /dev/null differ
diff --git a/sublime/Packages/Default/swap_line (Hackintosh's conflicted copy 2012-07-24).pyc b/sublime/Packages/Default/swap_line (Hackintosh's conflicted copy 2012-07-24).pyc
deleted file mode 100644
index 3151553..0000000
Binary files a/sublime/Packages/Default/swap_line (Hackintosh's conflicted copy 2012-07-24).pyc and /dev/null differ
diff --git a/sublime/Packages/Default/switch_file (Hackintosh's conflicted copy 2012-07-23).pyc b/sublime/Packages/Default/switch_file (Hackintosh's conflicted copy 2012-07-23).pyc
deleted file mode 100644
index 6d9e022..0000000
Binary files a/sublime/Packages/Default/switch_file (Hackintosh's conflicted copy 2012-07-23).pyc and /dev/null differ
diff --git a/sublime/Packages/Default/switch_file (Hackintosh's conflicted copy 2012-07-24).pyc b/sublime/Packages/Default/switch_file (Hackintosh's conflicted copy 2012-07-24).pyc
deleted file mode 100644
index 6d9e022..0000000
Binary files a/sublime/Packages/Default/switch_file (Hackintosh's conflicted copy 2012-07-24).pyc and /dev/null differ
diff --git a/sublime/Packages/Default/transform (Hackintosh's conflicted copy 2012-07-23).pyc b/sublime/Packages/Default/transform (Hackintosh's conflicted copy 2012-07-23).pyc
deleted file mode 100644
index 2471eef..0000000
Binary files a/sublime/Packages/Default/transform (Hackintosh's conflicted copy 2012-07-23).pyc and /dev/null differ
diff --git a/sublime/Packages/Default/transform (Hackintosh's conflicted copy 2012-07-24).pyc b/sublime/Packages/Default/transform (Hackintosh's conflicted copy 2012-07-24).pyc
deleted file mode 100644
index 2471eef..0000000
Binary files a/sublime/Packages/Default/transform (Hackintosh's conflicted copy 2012-07-24).pyc and /dev/null differ
diff --git a/sublime/Packages/Default/transpose (Hackintosh's conflicted copy 2012-07-23).pyc b/sublime/Packages/Default/transpose (Hackintosh's conflicted copy 2012-07-23).pyc
deleted file mode 100644
index 2509a6b..0000000
Binary files a/sublime/Packages/Default/transpose (Hackintosh's conflicted copy 2012-07-23).pyc and /dev/null differ
diff --git a/sublime/Packages/Default/transpose (Hackintosh's conflicted copy 2012-07-24).pyc b/sublime/Packages/Default/transpose (Hackintosh's conflicted copy 2012-07-24).pyc
deleted file mode 100644
index 2509a6b..0000000
Binary files a/sublime/Packages/Default/transpose (Hackintosh's conflicted copy 2012-07-24).pyc and /dev/null differ
diff --git a/sublime/Packages/Default/trim_trailing_white_space (Hackintosh's conflicted copy 2012-07-23).pyc b/sublime/Packages/Default/trim_trailing_white_space (Hackintosh's conflicted copy 2012-07-23).pyc
deleted file mode 100644
index 18cd417..0000000
Binary files a/sublime/Packages/Default/trim_trailing_white_space (Hackintosh's conflicted copy 2012-07-23).pyc and /dev/null differ
diff --git a/sublime/Packages/Default/trim_trailing_white_space (Hackintosh's conflicted copy 2012-07-24).pyc b/sublime/Packages/Default/trim_trailing_white_space (Hackintosh's conflicted copy 2012-07-24).pyc
deleted file mode 100644
index 18cd417..0000000
Binary files a/sublime/Packages/Default/trim_trailing_white_space (Hackintosh's conflicted copy 2012-07-24).pyc and /dev/null differ
diff --git a/sublime/Packages/Erlang/Erlang.tmLanguage (Hackintosh's conflicted copy 2012-07-23).cache b/sublime/Packages/Erlang/Erlang.tmLanguage (Hackintosh's conflicted copy 2012-07-23).cache
deleted file mode 100644
index 748ed71..0000000
Binary files a/sublime/Packages/Erlang/Erlang.tmLanguage (Hackintosh's conflicted copy 2012-07-23).cache and /dev/null differ
diff --git a/sublime/Packages/Erlang/HTML (Erlang).tmLanguage (Hackintosh's conflicted copy 2012-07-23).cache b/sublime/Packages/Erlang/HTML (Erlang).tmLanguage (Hackintosh's conflicted copy 2012-07-23).cache
deleted file mode 100644
index 61ac390..0000000
Binary files a/sublime/Packages/Erlang/HTML (Erlang).tmLanguage (Hackintosh's conflicted copy 2012-07-23).cache and /dev/null differ
diff --git a/sublime/Packages/Erlang/Indentation Rules.tmPreferences (Hackintosh's conflicted copy 2012-07-23).cache b/sublime/Packages/Erlang/Indentation Rules.tmPreferences (Hackintosh's conflicted copy 2012-07-23).cache
deleted file mode 100644
index 80f2c32..0000000
Binary files a/sublime/Packages/Erlang/Indentation Rules.tmPreferences (Hackintosh's conflicted copy 2012-07-23).cache and /dev/null differ
diff --git a/sublime/Packages/Groovy/Groovy.tmLanguage (Hackintosh's conflicted copy 2012-07-23).cache b/sublime/Packages/Groovy/Groovy.tmLanguage (Hackintosh's conflicted copy 2012-07-23).cache
deleted file mode 100644
index 3883ef8..0000000
Binary files a/sublime/Packages/Groovy/Groovy.tmLanguage (Hackintosh's conflicted copy 2012-07-23).cache and /dev/null differ
diff --git a/sublime/Packages/HTML/encode_html_entities (Hackintosh's conflicted copy 2012-07-23).pyc b/sublime/Packages/HTML/encode_html_entities (Hackintosh's conflicted copy 2012-07-23).pyc
deleted file mode 100644
index 7a8bcf1..0000000
Binary files a/sublime/Packages/HTML/encode_html_entities (Hackintosh's conflicted copy 2012-07-23).pyc and /dev/null differ
diff --git a/sublime/Packages/HTML/encode_html_entities (Hackintosh's conflicted copy 2012-07-24).pyc b/sublime/Packages/HTML/encode_html_entities (Hackintosh's conflicted copy 2012-07-24).pyc
deleted file mode 100644
index 7a8bcf1..0000000
Binary files a/sublime/Packages/HTML/encode_html_entities (Hackintosh's conflicted copy 2012-07-24).pyc and /dev/null differ
diff --git a/sublime/Packages/HTML/html_completions (Hackintosh's conflicted copy 2012-07-24).pyc b/sublime/Packages/HTML/html_completions (Hackintosh's conflicted copy 2012-07-24).pyc
deleted file mode 100644
index 650a5de..0000000
Binary files a/sublime/Packages/HTML/html_completions (Hackintosh's conflicted copy 2012-07-24).pyc and /dev/null differ
diff --git a/sublime/Packages/HTML/html_completions (Ruxton's conflicted copy 2012-07-23).pyc b/sublime/Packages/HTML/html_completions (Ruxton's conflicted copy 2012-07-23).pyc
deleted file mode 100644
index c0ad82a..0000000
Binary files a/sublime/Packages/HTML/html_completions (Ruxton's conflicted copy 2012-07-23).pyc and /dev/null differ
diff --git a/sublime/Packages/Haskell/Literate Haskell.tmLanguage (Hackintosh's conflicted copy 2012-07-23).cache b/sublime/Packages/Haskell/Literate Haskell.tmLanguage (Hackintosh's conflicted copy 2012-07-23).cache
deleted file mode 100644
index fbb3f7e..0000000
Binary files a/sublime/Packages/Haskell/Literate Haskell.tmLanguage (Hackintosh's conflicted copy 2012-07-23).cache and /dev/null differ
diff --git a/sublime/Packages/Java/Java Server Pages (JSP).tmLanguage (Hackintosh's conflicted copy 2012-07-23).cache b/sublime/Packages/Java/Java Server Pages (JSP).tmLanguage (Hackintosh's conflicted copy 2012-07-23).cache
deleted file mode 100644
index 623aea1..0000000
Binary files a/sublime/Packages/Java/Java Server Pages (JSP).tmLanguage (Hackintosh's conflicted copy 2012-07-23).cache and /dev/null differ
diff --git a/sublime/Packages/Java/Java.tmLanguage (Hackintosh's conflicted copy 2012-07-23).cache b/sublime/Packages/Java/Java.tmLanguage (Hackintosh's conflicted copy 2012-07-23).cache
deleted file mode 100644
index 1779a9b..0000000
Binary files a/sublime/Packages/Java/Java.tmLanguage (Hackintosh's conflicted copy 2012-07-23).cache and /dev/null differ
diff --git a/sublime/Packages/Java/JavaDoc.tmLanguage (Hackintosh's conflicted copy 2012-07-23).cache b/sublime/Packages/Java/JavaDoc.tmLanguage (Hackintosh's conflicted copy 2012-07-23).cache
deleted file mode 100644
index 575fd51..0000000
Binary files a/sublime/Packages/Java/JavaDoc.tmLanguage (Hackintosh's conflicted copy 2012-07-23).cache and /dev/null differ
diff --git a/sublime/Packages/Java/JavaProperties.tmLanguage (Hackintosh's conflicted copy 2012-07-23).cache b/sublime/Packages/Java/JavaProperties.tmLanguage (Hackintosh's conflicted copy 2012-07-23).cache
deleted file mode 100644
index 943ece8..0000000
Binary files a/sublime/Packages/Java/JavaProperties.tmLanguage (Hackintosh's conflicted copy 2012-07-23).cache and /dev/null differ
diff --git a/sublime/Packages/Java/Symbol List%3A Inner Inner Class Methods.tmPreferences (Hackintosh's conflicted copy 2012-07-23).cache b/sublime/Packages/Java/Symbol List%3A Inner Inner Class Methods.tmPreferences (Hackintosh's conflicted copy 2012-07-23).cache
deleted file mode 100644
index 5fead16..0000000
Binary files a/sublime/Packages/Java/Symbol List%3A Inner Inner Class Methods.tmPreferences (Hackintosh's conflicted copy 2012-07-23).cache and /dev/null differ
diff --git a/sublime/Packages/LaTeX/Bibtex.tmLanguage (Hackintosh's conflicted copy 2012-07-23).cache b/sublime/Packages/LaTeX/Bibtex.tmLanguage (Hackintosh's conflicted copy 2012-07-23).cache
deleted file mode 100644
index 5dde3c0..0000000
Binary files a/sublime/Packages/LaTeX/Bibtex.tmLanguage (Hackintosh's conflicted copy 2012-07-23).cache and /dev/null differ
diff --git a/sublime/Packages/LaTeX/LaTeX Beamer.tmLanguage (Hackintosh's conflicted copy 2012-07-23).cache b/sublime/Packages/LaTeX/LaTeX Beamer.tmLanguage (Hackintosh's conflicted copy 2012-07-23).cache
deleted file mode 100644
index b323690..0000000
Binary files a/sublime/Packages/LaTeX/LaTeX Beamer.tmLanguage (Hackintosh's conflicted copy 2012-07-23).cache and /dev/null differ
diff --git a/sublime/Packages/LaTeX/LaTeX Log.tmLanguage (Hackintosh's conflicted copy 2012-07-23).cache b/sublime/Packages/LaTeX/LaTeX Log.tmLanguage (Hackintosh's conflicted copy 2012-07-23).cache
deleted file mode 100644
index 6eff2e9..0000000
Binary files a/sublime/Packages/LaTeX/LaTeX Log.tmLanguage (Hackintosh's conflicted copy 2012-07-23).cache and /dev/null differ
diff --git a/sublime/Packages/LaTeX/LaTeX Memoir.tmLanguage (Hackintosh's conflicted copy 2012-07-23).cache b/sublime/Packages/LaTeX/LaTeX Memoir.tmLanguage (Hackintosh's conflicted copy 2012-07-23).cache
deleted file mode 100644
index 6416b53..0000000
Binary files a/sublime/Packages/LaTeX/LaTeX Memoir.tmLanguage (Hackintosh's conflicted copy 2012-07-23).cache and /dev/null differ
diff --git a/sublime/Packages/LaTeX/LaTeX.tmLanguage (Hackintosh's conflicted copy 2012-07-23).cache b/sublime/Packages/LaTeX/LaTeX.tmLanguage (Hackintosh's conflicted copy 2012-07-23).cache
deleted file mode 100644
index 60c6405..0000000
Binary files a/sublime/Packages/LaTeX/LaTeX.tmLanguage (Hackintosh's conflicted copy 2012-07-23).cache and /dev/null differ
diff --git a/sublime/Packages/LaTeX/TeX Math.tmLanguage (Hackintosh's conflicted copy 2012-07-23).cache b/sublime/Packages/LaTeX/TeX Math.tmLanguage (Hackintosh's conflicted copy 2012-07-23).cache
deleted file mode 100644
index b5e75ab..0000000
Binary files a/sublime/Packages/LaTeX/TeX Math.tmLanguage (Hackintosh's conflicted copy 2012-07-23).cache and /dev/null differ
diff --git a/sublime/Packages/LaTeX/TeX.tmLanguage (Hackintosh's conflicted copy 2012-07-23).cache b/sublime/Packages/LaTeX/TeX.tmLanguage (Hackintosh's conflicted copy 2012-07-23).cache
deleted file mode 100644
index edc2ec1..0000000
Binary files a/sublime/Packages/LaTeX/TeX.tmLanguage (Hackintosh's conflicted copy 2012-07-23).cache and /dev/null differ
diff --git a/sublime/Packages/Markdown/Markdown.tmLanguage (Hackintosh's conflicted copy 2012-07-23).cache b/sublime/Packages/Markdown/Markdown.tmLanguage (Hackintosh's conflicted copy 2012-07-23).cache
deleted file mode 100644
index 85bce93..0000000
Binary files a/sublime/Packages/Markdown/Markdown.tmLanguage (Hackintosh's conflicted copy 2012-07-23).cache and /dev/null differ
diff --git a/sublime/Packages/Markdown/MultiMarkdown.tmLanguage (Hackintosh's conflicted copy 2012-07-23).cache b/sublime/Packages/Markdown/MultiMarkdown.tmLanguage (Hackintosh's conflicted copy 2012-07-23).cache
deleted file mode 100644
index 49014b3..0000000
Binary files a/sublime/Packages/Markdown/MultiMarkdown.tmLanguage (Hackintosh's conflicted copy 2012-07-23).cache and /dev/null differ
diff --git a/sublime/Packages/Markdown/Symbol List - Heading.tmPreferences (Hackintosh's conflicted copy 2012-07-23).cache b/sublime/Packages/Markdown/Symbol List - Heading.tmPreferences (Hackintosh's conflicted copy 2012-07-23).cache
deleted file mode 100644
index 532b81b..0000000
Binary files a/sublime/Packages/Markdown/Symbol List - Heading.tmPreferences (Hackintosh's conflicted copy 2012-07-23).cache and /dev/null differ
diff --git a/sublime/Packages/Matlab/Indent.tmPreferences (Hackintosh's conflicted copy 2012-07-23).cache b/sublime/Packages/Matlab/Indent.tmPreferences (Hackintosh's conflicted copy 2012-07-23).cache
deleted file mode 100644
index d0397d6..0000000
Binary files a/sublime/Packages/Matlab/Indent.tmPreferences (Hackintosh's conflicted copy 2012-07-23).cache and /dev/null differ
diff --git a/sublime/Packages/Matlab/Matlab.tmLanguage (Ruxton's conflicted copy 2012-07-23).cache b/sublime/Packages/Matlab/Matlab.tmLanguage (Ruxton's conflicted copy 2012-07-23).cache
deleted file mode 100644
index 6f17fe9..0000000
Binary files a/sublime/Packages/Matlab/Matlab.tmLanguage (Ruxton's conflicted copy 2012-07-23).cache and /dev/null differ
diff --git a/sublime/Packages/Matlab/Miscellaneous.tmPreferences (Hackintosh's conflicted copy 2012-07-23).cache b/sublime/Packages/Matlab/Miscellaneous.tmPreferences (Hackintosh's conflicted copy 2012-07-23).cache
deleted file mode 100644
index ef02d03..0000000
Binary files a/sublime/Packages/Matlab/Miscellaneous.tmPreferences (Hackintosh's conflicted copy 2012-07-23).cache and /dev/null differ
diff --git a/sublime/Packages/Matlab/Symbols.tmPreferences (Hackintosh's conflicted copy 2012-07-23).cache b/sublime/Packages/Matlab/Symbols.tmPreferences (Hackintosh's conflicted copy 2012-07-23).cache
deleted file mode 100644
index ea31fd3..0000000
Binary files a/sublime/Packages/Matlab/Symbols.tmPreferences (Hackintosh's conflicted copy 2012-07-23).cache and /dev/null differ
diff --git a/sublime/Packages/OCaml/Indent rules.tmPreferences (Hackintosh's conflicted copy 2012-07-23).cache b/sublime/Packages/OCaml/Indent rules.tmPreferences (Hackintosh's conflicted copy 2012-07-23).cache
deleted file mode 100644
index 16235bb..0000000
Binary files a/sublime/Packages/OCaml/Indent rules.tmPreferences (Hackintosh's conflicted copy 2012-07-23).cache and /dev/null differ
diff --git a/sublime/Packages/OCaml/OCaml.tmLanguage (Hackintosh's conflicted copy 2012-07-23).cache b/sublime/Packages/OCaml/OCaml.tmLanguage (Hackintosh's conflicted copy 2012-07-23).cache
deleted file mode 100644
index 0262898..0000000
Binary files a/sublime/Packages/OCaml/OCaml.tmLanguage (Hackintosh's conflicted copy 2012-07-23).cache and /dev/null differ
diff --git a/sublime/Packages/OCaml/OCamllex.tmLanguage (Hackintosh's conflicted copy 2012-07-23).cache b/sublime/Packages/OCaml/OCamllex.tmLanguage (Hackintosh's conflicted copy 2012-07-23).cache
deleted file mode 100644
index edd8e50..0000000
Binary files a/sublime/Packages/OCaml/OCamllex.tmLanguage (Hackintosh's conflicted copy 2012-07-23).cache and /dev/null differ
diff --git a/sublime/Packages/OCaml/OCamlyacc.tmLanguage (Hackintosh's conflicted copy 2012-07-23).cache b/sublime/Packages/OCaml/OCamlyacc.tmLanguage (Hackintosh's conflicted copy 2012-07-23).cache
deleted file mode 100644
index 65d03d9..0000000
Binary files a/sublime/Packages/OCaml/OCamlyacc.tmLanguage (Hackintosh's conflicted copy 2012-07-23).cache and /dev/null differ
diff --git a/sublime/Packages/OCaml/camlp4.tmLanguage (Hackintosh's conflicted copy 2012-07-23).cache b/sublime/Packages/OCaml/camlp4.tmLanguage (Hackintosh's conflicted copy 2012-07-23).cache
deleted file mode 100644
index f549f36..0000000
Binary files a/sublime/Packages/OCaml/camlp4.tmLanguage (Hackintosh's conflicted copy 2012-07-23).cache and /dev/null differ
diff --git a/sublime/Packages/Objective-C/Objective-C++.tmLanguage (Hackintosh's conflicted copy 2012-07-23).cache b/sublime/Packages/Objective-C/Objective-C++.tmLanguage (Hackintosh's conflicted copy 2012-07-23).cache
deleted file mode 100644
index 2f4a680..0000000
Binary files a/sublime/Packages/Objective-C/Objective-C++.tmLanguage (Hackintosh's conflicted copy 2012-07-23).cache and /dev/null differ
diff --git a/sublime/Packages/Objective-C/Objective-C.tmLanguage (Ruxton's conflicted copy 2012-07-23).cache b/sublime/Packages/Objective-C/Objective-C.tmLanguage (Ruxton's conflicted copy 2012-07-23).cache
deleted file mode 100644
index df4b1f0..0000000
Binary files a/sublime/Packages/Objective-C/Objective-C.tmLanguage (Ruxton's conflicted copy 2012-07-23).cache and /dev/null differ
diff --git a/sublime/Packages/PHP/PHP.tmLanguage (Ruxton's conflicted copy 2012-07-23).cache b/sublime/Packages/PHP/PHP.tmLanguage (Ruxton's conflicted copy 2012-07-23).cache
deleted file mode 100644
index 0216f39..0000000
Binary files a/sublime/Packages/PHP/PHP.tmLanguage (Ruxton's conflicted copy 2012-07-23).cache and /dev/null differ
diff --git a/sublime/Packages/Perl/Perl.tmLanguage (Hackintosh's conflicted copy 2012-07-23).cache b/sublime/Packages/Perl/Perl.tmLanguage (Hackintosh's conflicted copy 2012-07-23).cache
deleted file mode 100644
index ff45307..0000000
Binary files a/sublime/Packages/Perl/Perl.tmLanguage (Hackintosh's conflicted copy 2012-07-23).cache and /dev/null differ
diff --git a/sublime/Packages/Python/Regular Expressions (Python).tmLanguage (Hackintosh's conflicted copy 2012-07-23).cache b/sublime/Packages/Python/Regular Expressions (Python).tmLanguage (Hackintosh's conflicted copy 2012-07-23).cache
deleted file mode 100644
index 6bd14e7..0000000
Binary files a/sublime/Packages/Python/Regular Expressions (Python).tmLanguage (Hackintosh's conflicted copy 2012-07-23).cache and /dev/null differ
diff --git a/sublime/Packages/Python/Symbol List.tmPreferences (Hackintosh's conflicted copy 2012-07-23).cache b/sublime/Packages/Python/Symbol List.tmPreferences (Hackintosh's conflicted copy 2012-07-23).cache
deleted file mode 100644
index 242f809..0000000
Binary files a/sublime/Packages/Python/Symbol List.tmPreferences (Hackintosh's conflicted copy 2012-07-23).cache and /dev/null differ
diff --git a/sublime/Packages/R/R Console.tmLanguage (Hackintosh's conflicted copy 2012-07-23).cache b/sublime/Packages/R/R Console.tmLanguage (Hackintosh's conflicted copy 2012-07-23).cache
deleted file mode 100644
index 133a166..0000000
Binary files a/sublime/Packages/R/R Console.tmLanguage (Hackintosh's conflicted copy 2012-07-23).cache and /dev/null differ
diff --git a/sublime/Packages/R/R.tmLanguage (Hackintosh's conflicted copy 2012-07-23).cache b/sublime/Packages/R/R.tmLanguage (Hackintosh's conflicted copy 2012-07-23).cache
deleted file mode 100644
index dd2f6c1..0000000
Binary files a/sublime/Packages/R/R.tmLanguage (Hackintosh's conflicted copy 2012-07-23).cache and /dev/null differ
diff --git a/sublime/Packages/R/Rd (R Documentation).tmLanguage (Hackintosh's conflicted copy 2012-07-23).cache b/sublime/Packages/R/Rd (R Documentation).tmLanguage (Hackintosh's conflicted copy 2012-07-23).cache
deleted file mode 100644
index 58dfd13..0000000
Binary files a/sublime/Packages/R/Rd (R Documentation).tmLanguage (Hackintosh's conflicted copy 2012-07-23).cache and /dev/null differ
diff --git a/sublime/Packages/Ruby/Miscellaneous.tmPreferences (Hackintosh's conflicted copy 2012-07-23).cache b/sublime/Packages/Ruby/Miscellaneous.tmPreferences (Hackintosh's conflicted copy 2012-07-23).cache
deleted file mode 100644
index ea3f6e7..0000000
Binary files a/sublime/Packages/Ruby/Miscellaneous.tmPreferences (Hackintosh's conflicted copy 2012-07-23).cache and /dev/null differ
diff --git a/sublime/Packages/ShellScript/Miscellaneous.tmPreferences (Hackintosh's conflicted copy 2012-07-23).cache b/sublime/Packages/ShellScript/Miscellaneous.tmPreferences (Hackintosh's conflicted copy 2012-07-23).cache
deleted file mode 100644
index b50d579..0000000
Binary files a/sublime/Packages/ShellScript/Miscellaneous.tmPreferences (Hackintosh's conflicted copy 2012-07-23).cache and /dev/null differ
diff --git a/sublime/Packages/TCL/Tcl.tmLanguage (Hackintosh's conflicted copy 2012-07-23).cache b/sublime/Packages/TCL/Tcl.tmLanguage (Hackintosh's conflicted copy 2012-07-23).cache
deleted file mode 100644
index b52349b..0000000
Binary files a/sublime/Packages/TCL/Tcl.tmLanguage (Hackintosh's conflicted copy 2012-07-23).cache and /dev/null differ
diff --git a/sublime/Packages/Textile/Textile.tmLanguage (Hackintosh's conflicted copy 2012-07-23).cache b/sublime/Packages/Textile/Textile.tmLanguage (Hackintosh's conflicted copy 2012-07-23).cache
deleted file mode 100644
index eeef12f..0000000
Binary files a/sublime/Packages/Textile/Textile.tmLanguage (Hackintosh's conflicted copy 2012-07-23).cache and /dev/null differ