Regulating battery transport

As lithium batteries become increasingly prevalent, the risks involved in shipping them must be managed. So what rules are being developed to keep everyone safe?