Merge pull request #13 from brianjmiller/master

Mostly a bump to TinCanJS