Clean up formatting, maintain consistent style, remove whitespace
Merge pull request #7 from beaucharman/master

Clean up formatting, maintain consistent style, remove trailing whitespace