Add tiny.vimrc and change editor for git
Merge branch 'master' into mac