Address some of Dustin's review comments.
Add a bunch of stuff for servo master
Add a bunch more stuff for Servo master.