Added foldings comments. Expanded commands to their full versions
more comments and folds. Added default foldmethod for vim files
resolved conflict