split map.js
reorder functions and attrs
create photo object, partial refactor
patched omniauth scope
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'remotes/origin/photo_upload'
refactor to fully use Photo class
remove commented lines
uses own height/width functions
fixed instagram caption bug
Merge branch 'master' into js_refactor
Merge remote-tracking branch 'origin/facebook_album' into jasmine
Merge remote-tracking branch 'origin/editing_photo_attributes' into jasmine
add jasmine tests
use more efficient loop
add jasmine tests
ajaxed all the things (specifically the edit form)
add vertCenter and test
add trips_controller_specs
add trips controller specs