Updates to staffing
Merge pull request #445 from gvwilson/staffing-2013-04-04

Updates to staffing