Small changes

* New git aliases
* Git push uses tracking branch
* Vim-Surround removed