some co scheduling fixes
Merge branch 'master' of github.com:slbird/pacora-isca-2013