Resolve conflicts with upstream in .travis.yml
Add license for jasmine rake
Resolve conflicts with upstream develop
Merge pull request #179 from mtc2013/jasmine_yml

Jasmine: a re-config, an upgrade, and a hack