Shaming timaste -> timmytaste

That's me :(
Merge pull request #38 from timmytaste/patch-1

Shaming timaste -> timmytaste
Comma police

Some kind of comma http://www.shacknews.com/chatty?id=32162105#item_32162105
Merge pull request #40 from timmytaste/patch-3

Comma police
Merge remote-tracking branch 'upstream/master'