removed code folding in vimrc, and cleaned up a bit as well