branching getting crazy

@gregk27 , I am not sure what is in master right now so I am hesitant to pull into it.
We have, intake, durham changes, and now arm_safety_jacob ( a branch off durham changes) .  It would be good to get back to master.

arm_safety_jacob should probably be rebased off master once the other branches are merged in.