Default git to merge with --no-ff
Default to no paredit
Adding more keybindings
UPdaing ssh conf