Ryu2janus

Includes some of Hesam's ARP-less items as well as updates to work with latest Janus.