Cy/merge

Based on testing to date, it looks like the merge branch merging in the BRL-CAD version of SCL to stepcode is ready to go live.