vimrc & tmux.conf updated: airline, etc.
Merge branch 'master' of https://github.com/cdalgicdir/scripts
merge