Vim maintenance
Switched back to vim tabs and improved snippets