Add additional options option and update docs.
Allow the name option to be a callable.
Uncomment the comment.
Varios things added and fixed.
A good pound of magic removed.

 - Cyclone and gevent are broken at the moment.