changed source of s3_upload gem
removed console.logs and commented-out sections
removed unused getPixelPositions function
moved script invocation to trip show page
minor tweaks
merged new master
move jquery-ui to vendor folder
added datepicker script to new view instead of separate file
show trip view starts related js
moved uploader initializer to the view
merged js refactor
cleaned up controllers and removed voodoo
removed unneeded map partial
set layout background image to static google map
add missing semicolons
removed colors from photo table and moved to new table
style landing page
now pulling down facebook album photos
changed palette table to hold 6 colors
Merge remote-tracking branch 'origin/views' into photo_upload