Ops without ging merge

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