Merge branch 'master' of github.com:muuankarski/rustfare

Conflicts:
	R/spatial.R
Changing data file locations again

Merge branch 'master' of github.com:muuankarski/rustfare

Conflicts:
	R/spatial.R