Feature/rails 4 support

This time trying to merge to the correct branch...
@rossjourdain is this ready to merge or is more testing needed?