Replaced & and @ with and and at
Fixed some typos from removing street directions
Merge branch 'master' of github.com:arneheggestad/gtfs

Conflicts:
	stops.txt