Add trip distance method
Merge branch 'master' of github.com:rosskinney/traintastic

Conflicts:
	train.rb