Moved options to own block.
Complete restructuring of .vimrc

Includes folds.