Merge pull request #33 from jarsen/master

Disable automatic forced canvas login
added enrollment type
Merge remote-tracking branch 'instructure/CanvasKit/master'
Merge pull request #34 from elgreco84/master

Enrollments Added
Merge remote-tracking branch 'instructure/CanvasKit/master'