changed source of s3_upload gem
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
split map.js
cleaned up controllers and removed voodoo
reorder functions and attrs
create photo object, partial refactor
removed colors from photo table and moved to new table
now pulling down facebook album photos
changed palette table to hold 6 colors
Merge remote-tracking branch 'origin/views' into photo_upload
merged with new views
Merge remote-tracking branch 'origin/facebook_album' into photo_upload
patched omniauth scope
Merge remote-tracking branch 'origin/master'