Merge back to OpenWorm

Got through validation of most features besides locomotion