Added some comments; fixed tests so that they compile for Boost.Optional in 1.56.
Updated uri submodule.