Updated format and structure of .vimrc file
Merged changes from develop->master