Fine tuned the matching for trailing whitespaces
fixing some broken things
fixed two typos
Used the trailing whitespaces command from the vim wiki:
http://vim.wikia.com/wiki/Highlight_unwanted_spaces