Change git merge alias
Use regular font style for jellybeans gui comment
Remove unnecessary jellybeans overrides