Remove trailing whitespace
Merge branch 'trello-44-logging' into dryad-staging