TODO StripTrailingWhitespaces()
Merge branch 'master' of github.com:Bost/dotfiles

Conflicts:
	vimrc
inst visualvm