some changes, will throw everything away now and refactor vim setup
committing