Fix broken whitespace issues

I was developing on a box that didnt have a proper vimrc. Hence my
whitespace problems - fix that here.