fixes for ActiveModel 3.2, compatibles with 4.0 and 4.1
attempt to make Travis-CI pass without matrix anymore