Update mercurial preferences
Misc Zsh settings
Add and tidy gitconfig
Updated promt
Enable git rerere
Update README
fixed merge issues with master branch