Made API more consistent, query string parameters are now referred to as "query" throughout.

Removed the "deserializeQuery" hook as it made little sense; everything in it can be achieved
using deserialize. Added transitionToWithQuery to route and transitionToRouteWithQuery
to the ControllerMixin.