fix comments in picture.coffee
update templates, Readme, and cart.js to use routes
merge changes