Fix broken ushadi link
Merge pull request #64 from rossbruniges/fix-ushadi

Fix broken ushadi link
Merge pull request #65 from mozilla/dev

Merge up from dev to master