Updated uri submodule.
Updated tests to work using Boost 1.56 (cf. Boost.Optional).
Merge remote-tracking branch 'upstream/master'