Updated gitconfig and emacs settings

- Changed git push default to simple (default in 2.0)
- Changed evil-mode in emacs to not override cursor color