Formatting

This changes everything.
Merge pull request #131 from wiredearp/master

Formatting