Merge versions. Added setlocals and softtabstop.