vim filetype keybindings, fixes
Added i3 config comments, 1 sass snippet and vim redraw options
Merge branch 'master' of https://github.com/dmitriy-korotayev/dotfiles

Conflicts:
	zsh/.zshrc