Reworked and cleaned up dev dependencies

Should be merged before 0.8.6 release.
/cc @arnvald