Merge branch 'issues/35' of https://github.com/killercup/crates.io into killercup-issues/35
A handful of cleanups
Fix tidy warnings and add some tests
Merge branch 'wycats-cleanup'