Moves ordering of reminders from query to assoc
Merge branch 'master' into aws