added rainbow delimiters, customized some color faces and set tab width to 2
added keybing for magit
merge