[vim] scala correct """ syntax
[vim] scala ft settings
[vim] scala sw=2:ts=2
[tmux] changes, esp to update-environment (now it actually collects the vars instead of overwriting)
[vim] blue RedundantSpaces, timeoutlen and switching between buffers without saving
Merge branch 'master' of https://github.com/dansanduleac/config

Conflicts:
	conf/vim/vim/after/ftplugin/scala.vim
	conf/vim/vim/plugin/31-create-scala.vim