Removed extra newlines
Fixed comment
Remove trailing whietespaces on write.

Based on: https://github.com/nestorsalceda/dotfiles/blob/master/vimrc#L81
Merge branch 'master' into alea