Add an option to disable trailing spaces cleanup. Handle local vimrc from the .git folder
Merge branch 'master' of github-serebrov:serebrov/vimrc