removing vim .swo and .swp files
merging master into local master