added vim settings
merging