2014/1/1
Merge https://github.com/spacewander/spacewander-vim