refactor($q): make $q Promises A+ v1.1 compilant

Refactor to make $q Promises A+ v1.1 compilant
Did this as a suggestion from @jeffbcross that this adds a small speedup. I saw about 2-3% speedup, but I am willing to change it to what it was before if you think it is best