all current code rev2

upload of all current code minus the shape sensor code as of the MVR
completion on 12/6/13