Remove bundle “Merge Markers”.

This is now included in TextMate’s bundle index and can (should) be installed from there.
Update upstream-urls
Submodule updates: Ruby, SCSS, Shell Script, Source, Text

Ruby.tmbundle: 45799ef..983c9f1

  * 983c9f1 Reset “encoding” snippet to upstream. (Stefan Daschek)

    This is rarely used nowadays, so no need for a customized version
    anymore.

  * 254891d Allow for private prefixes to method definitions (Michael Sheets)

    Fixes #65.

SCSS.tmbundle: f472332..5cef467

  * a055960 A few flexbox property names (Lane Goldberg)

  * 501cbcc Fix picture's place in selector_entities (Petri Partio)

  * 40d22fd Add picture to completions (Petri Partio)

  * c9b1f9a Add picture to valid selector_entities (Petri Partio)

Shell Script.tmbundle: 8584562..efbb658

  * efbb658 Rest “Open directory in Terminal” to upstream. (Stefan Daschek)

    Upstream now defaults to open a new tab, so no need for a customized
    version anymore \o/

  * c1077db Default to new tab for 'Open Terminal' (Stefan Daschek)

    Set `TM_TERMINAL_NEW_WINDOW` if you prefer to open a new window instead.

  * 4af46ee Use tab for “Open directory in Terminal” (optionally). (Stefan Daschek)

    If `TM_TERMINAL_USE_TABS` is set, the command now creates a new tab in
    the frontmost terminal window (instead of opening a new terminal
    window).

Source.tmbundle: 8cc05e4..09f5293

  * e8b4aa3 Use latest version of ruby rather than the shim (Michael Sheets)

    This allows ruby to correctly match unicode characters when 2.0 is
    present. Fixes #18.

Text.tmbundle: b5d33bc..0b34c67

  * c536e81 Rewrite filtering commands in ruby (Allan Odgaard)

    Previously these were using ruby for the UI and python for the
    implementation with bash to bind it together.