Add trailing whitespace
Merge branch 'master' of github.com:joequery/MyVPS
Update vim