ready to release

release 0.18.5

roll up changes and release 0.18.4

stage merged and conflicts resolved

0.18.0 releasd

release 0.17.7

0.17.6 released

0.17.5 release

conflicts - ugh

version 0.17.3 released