Include instance methods instead of extending them

Proper use of ActiveSupport::Concern, fixes problems with inheritance (i.e. calling super etc).