capified
modify capistrano files
Merge branch 'work'