New aliases from http://net.tutsplus.com/tutorials/tools-and-tips/git-tips-from-the-pros/
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitconfig
Alias for git difftool.