Whitespace nit picks

I set on 4 spaces, no tabs to match the majority of the project. I also removed trailing whitespace. And I collapsed some of the tests using `should.deepEqual`. Hope this isn't unwelcome. Happy to commit a subset.