addding vim plugin settings
merging master into local master copy