Fix an unresolved merge.
Fix some races and simplify things.
Switch back to a u_int.
Get rid of some debug prints that crept in.
Use a separate condition variable for module unload instead of
overloading the first one.
Merge branch '20130516-dtrace-callout-sleep' into markj-develop