some vim settings
merge changes