Changing the sublime text CLI to point to /Applications
customizations for jarvis
iTerm confirmation on quitting is annoying.
too many changes to specify
Adding DiffMerge as mergetool for git.

Merge branch 'master' of https://github.com/kaushikgopal/dotfiles

* 'master' of https://github.com/kaushikgopal/dotfiles:
  Pulled in changes from Mathias repo
  Added flushdns alias
  deleting old file. I want this in sync with Mathias so i can pull changes easily
  Syncing my preferences with the one Math
  Correcting the git log command to accept -p
  Adding helper functions for [pow server](http://journal.kaush.co/2013/04/08/pow/)
  Adding function to shorten present working directory if it's too long
  Added more sophisticated git display prompts
  cleaning up stuff
  changed alias to subl which is default vs sublime
  changing to my custom settings. will deal with new changes later.

Conflicts:
	.osx