refactored PS1
configured diff tool
[vim-airline] added branch symbol
fixed mappings