remove env
fix merge conflicts
new vimeo
add sessions stuff
mege conflicts
feeds controller
fix merge conflicts
fix merge conflicts