add capistrano
update cap settings
cap dependencies
merge conflicts