Update trip and stops on timetables to add ordering
fixing timetable stops
update rvmrc
Merge branch 'refs/heads/master' into Point2PointRouteFiltering

Conflicts:
	lib/ratis/request.rb