Better diff without whitespaces
New vim stuff; Small fixes