removing hardcoded width
fixing merge conflicts
trying to refactor flip flop uploading / saving to couchdb
adding notes about graphicsmagick