take 'theirs' gemfile.lock, change application.yml to use tuftsification
as root for binaries on dev laptops, add file_asset routes