Merge branch 'patch-3' of https://github.com/stevenvachon/canjs into patch-3