Cleanup after some vim usage :trollface:
Merge pull request #1901 from darthdeus/noob-editor-cleanup

Cleanup after some vim usage