Merge pull request #14 from derrh/master

Chicken and Egg problems with domain and client
Merge remote-tracking branch 'instructure/CanvasKit/master'