Fixing failing tests. Adding trips/maps_controller tests
Test updates
Merge branch 'master' into tests
Merge branch 'master' into tests
Merge branch 'master' into tests
Merge branch 'master' into tests
Merge branch 'master' into tests
Welcome hero
Kayak search widget
Adding TA library
Look and Feel colorscheme
Kayak and hero updates
Fixing broken photos on trip detail page
Rake task to populate home page
Stylesheet fix
Adding new thumbnail sizes for photos
Merge branch 'FrontPage'

Conflicts:
	app/models/photo.rb
Adding new thumbnail sizes for photos

Conflicts:
	app/models/photo.rb
Compiled Assets
Infinite Scroll