tweaks for sublime text and osx
added default push behavior from git 2 and above
merge conflict