Added some enhancements

Extra git commands
Removed sublime as merge tool

Sublime doesn't exist on most machines I work on, mainly
headless boxes, and isn't particularly nice for merging anyways