Added updates to work at CSX
Merge branch 'master' of https://github.com/NSLS-II-CSX/undcontrol