merge changes, added config file for vsvim