added capistrano
capified
cap merge