mattyhall Merge pull request #52 from Frizi/master

Rustfmt pass and slight macro stylistic changes

Latest commit 2b59749

Dec 18, 2018