Update 'nights' to be 'orders' in the ExtraSerializer.
Merge pull request #3 from ardavis/e_04

Update 'nights' to be 'orders' in the ExtraSerializer.
updating ember to RC3
update template
fix
fix
fix
Merge branch 'e_03' into e_04

Conflicts:
	Gemfile.lock
missing semicolon
missing semicolon
missing semicolon
missing semicolon
update ember versions
weird json fix
Merge branch 'e_01' into e_02

Conflicts:
	Gemfile
Merge branch 'e_02' into e_03
Merge branch 'e_03' into e_04

Conflicts:
	app/controllers/trips_controller.rb
new gemfile
Merge branch 'e_04' into e_04a

Conflicts:
	Gemfile.lock
	app/assets/javascripts/routes/app_router.js
oops