updated to handle rails 4
test ruby 2 on travis