sso
merge conflict
move canvas info into secrets/environment
rubocop
cleanup and documentation
rubocop
Merge branch 'sso_login' of https://github.com/adamdruppe/beyondz-platform into adamdruppe-sso_login

Conflicts:
	config/secrets.yml
	env.sample
Merge branch 'adamdruppe-sso_login' into staging