capistrano setup
getting ready for merge
still trying to merge
merged petosky branch to master
getting ready to deploy staging
syncing changes from merge