test
Merge branch 'master' of github.com:misogi/settings
fix vimrc