Merge branches 'gh-pages' and 'master' of https://github.com/eightyfour/canny
Change behavior for including jasmine files (quick fix for cache problem)