Ops without ging merge

This branch contains all the Ops work I've done plus Brian's bitrate control, but does *not* contain the latest from ging/master.  Working in both vagrant and opsworks.