Bits and bobs

* Rename from TraversableSaferTest to TraversableSaferTest
* Rename mapOpt/flatMapOpt to mapOption/flatMapOption in FutureOptionW
* Kill unused imports