-Added a few more git aliases. Added vimMerge script, for immediately viewing any files that have conflicts after a merge. I want to expand on this one a little bit so that I can get feedback whenever there are no conflicts.