Merge branch 'stop_times' of github.com:codeforanchorage/wheels-on-the-bus into stop_times

Conflicts:
	stop_times.rb
Merge branch 'stop_times' of github.com:codeforanchorage/wheels-on-the-bus into stop_times