Revise tiny.vimrc
Merge branch 'master' into mac