Adapt mockable to mock improvements

[ioleo]

Adapt @mockable macro to mock improvements by pulling the capability tags out of Service companion object to lie directly in modules companion object.

This will make much nicer syntax Module.method vs Module.Service.method which was just unnecessary boilerplate.