Bring all of infininight's changes into the main repo

infininight is the Module maintainer for TextMate.

Some of these changes are safe for 1.x, some for only 2.0

Up to 14a27bfca71569f8540967c2cda523ac787cba04 is safe for 1.x