Ecto 2.1 compatibility fixes

[ankhers]

This is a list of known compatibilty issues with Ecto 2.1. Feel free to tackle any of these tasks.

• [ ] on_conflict resolution
• [ ] or_where support

I will be adding more items here as we are made aware of them.

[scottmessinger]

Support ecto 3 just shipped so closing this!