Upgrade Jade + Watch

* Upgrading Jade
* Adding pull request from @shripadk