Changed theme to zenbrun and changes made to vimrc accordingly.
Added meld as standard merge tool.
Changed how folding works to use default folding type.