VIM: Use 4 space indentation by default
Update iTerm2 settings
Merge branch 'master' of github.com:artnez/environment