Refactored dotfiles, OS X only.
Setted up OS X diff tool to mercurial default merge tool.