whitespace cleanup
whitespace cleanup
Merge branch 'cleanup' into dev
Merge pull request #249 from alexmckenley/dev

Whitespace cleanup