Merge pull request #79 from sfu/sfu-develop

Merge sfu-develop
Merge branch 'refs/heads/sfu-develop' into sfu-deploy
Merge branch 'refs/heads/sfu-develop' into sfu-deploy
Merge branch 'refs/heads/sfu-develop' into sfu-deploy
Merge branch 'refs/heads/sfu-develop' into sfu-deploy
Merge branch 'refs/heads/sfu-develop' into sfu-deploy
Merge branch 'refs/heads/sfu-develop' into sfu-deploy
Merge pull request #99 from sfu/sfu-develop

Fix when enabling cross-listing course button
Merge pull request #100 from sfu/sfu-develop

Update number of production nodes in production.rb
Merge branch 'sfu-develop' into sfu-deploy
fix hijacking of Start New Course button in IE
Merge pull request #110 from grahamb/fix-course-form-js

Fix hijacking of Start New Course button in IE
Merge branch 'sfu-develop' into sfu-deploy
Merge branch 'refs/heads/sfu-develop' into sfu-deploy
Merge branch 'sfu-develop' into sfu-deploy
encode ssh username in gateway option
fix typo
Merge pull request #123 from sfu/sfu-develop

Fix gateway handling in capistrano deploy
Wrap everything in a if test to only execute on a test_cluster machine

A bug where character encoding was being changed from UTF-8 to ASCII-8BIT was encountered after this plugin was introduced. The mere presence of ApplicationController.class_eval (even as a no-op) triggers it, so as a workaround we only execute on true test_cluster machines, where the bug will exist but isn't as critical.
Reword self-enrollment checkbox (CANVAS-233)

The secret "code" is only relevant if self-registration is turned on.