https+capatross+capistrano updates
Merge branch 'development'