Merge branch 'stable' of https://github.com/nirds/canvas-lms into stable
Getting Capistrano stuff on the stable branch