cleaned up controllers and removed voodoo
now pulling down facebook album photos
Merge remote-tracking branch 'origin/facebook_album' into photo_upload