formatting

run everything through a formatter, get rid of all trailing whitespace
no real changes
Merge pull request #10 from slang800/master

formatting