waitOn improvements

[aramk]

Passes context into waitOn so you can use this.params. Returns handles from custom waitOn so they are waited on before loading the view.