Merge pull request #129 from Caldair/master

Fix CM tabletUI patches for latest builds
Revert "Fix CONFLICTS function"

Whoops. Needs work....if used with a pdroid mod, it messes up and tries to
apply one of the mods twice. Probably conflicts with the function that ensures
the pdroid-type mod is the first applied (which we do as a hack to make sure
that using prepatched "provisional" files doesn't overwrite other mods...if
pdroid is applied first then we cam layer the other mods on afterwards.
This reverts commit 71b9ade837d8bd269e7a7a96d4a4af171630ca33.
versioning to 2.9.875
Add a git check to auto_update, fix some OSX incompatible code and rearrange function that works, but shouldn't

That check for the git directory was supposed to be testing true...it was only passing b/c it was calle
from a sub directory. The removal of &>> was b/c OSX reports it errored. More testing on OSX is needed
but I haven't turned off auto-updating by default for then quite yet
versioning to 2.9.878