rebase from a59e513 for .vimrc from ruslan
authorAndrew Lorimer <andrew@lorimer.id.au>
Sat, 22 Dec 2018 11:40:44 +0000 (22:40 +1100)
committerAndrew Lorimer <andrew@lorimer.id.au>
Sat, 22 Dec 2018 11:40:44 +0000 (22:40 +1100)
Trivial merge