Going ahead with PUT vs. PATCH for now. Backbone isn't sending up stuff properly to honor that.
Can't use 'type' as an attribute name. Conflicts with model magic in Rails.
Various changes.
Merge branch 'working-prototype' of github.com:tiffani/transit-mix into working-prototype

Conflicts:
	transitmix-rails/app/assets/javascripts/views/line.js
Merge branch 'working-prototype' of github.com:tiffani/transit-mix into working-prototype

Conflicts:
	transitmix-rails/app/assets/javascripts/views/line.js