try using a join instead of include since we sort based on day_of_week

Note that I can only get this to crash on the server...

https://mail.google.com/mail/u/0/#inbox/141ccc281f3e3963
remove db mappings
add warning staging site
Merge branch 'master' into staging