Support 2.1

I've been testing against the latest from refinery 2.1.0.dev and things seem to be working well for me with these changes.