solorized
new vim
update
update
update
Merge branch 'master-3'