1. In .emacs, enable scala-mode, disable R-mode. 2. In .gitconfig, change [push] default to current.