add capistrano and vagrant
Merge branch 'staging'