added sourcing of local directory's .vimrc + small refactor