Small fixes for modules
Adds support for masquerading
Merge remote-tracking branch 'instructure/CanvasKit/master'

Conflicts:
	CanvasKit/Networking/CKIClient.m
Merge pull request #57 from derrh/master

Adds masquerading support in the client.