Merge pull request #5 from brianjmiller/master

Submodule match upstream
Merge pull request #6 from brianjmiller/master

Bump TinCanJS for CORS commit