Created a Fish shell activation file
Update the comments to reflect the .fish file extension
Make promise.js loadable via mozIJSSubScriptLoader.loadSubscipt (bug 834756)
Add Corey Farwell to the list of contributors

How could I resist :bowtie:
Bug 891698 - Disable path tests on OSX until we can find out why they aren't working on m-c r=me
Merge pull request #1077 from past/promise-subscriptloader

Bug 834756, make promise.js loadable via mozIJSSubScriptLoader.loadSubscipt r+=@jsantell
Merge pull request #1068 from frewsxcv/master

Bug 886201: Support bin/activate for Fish shell. r=Mossop
Bug 889029: removing tab.index assumption from testTabProperties
Merge pull request #1072 from erikvold/889029

Bug 889029: removing tab.index assumption from testTabProperties r=@jsantell
Disable only tests that actually break on tbpl.
Merge pull request #1092 from Gozala/hotfix/path

Bug 891698 - Reenable all tests except ones that mystiriously fail on tbpl a=@gozala
Bug 892126 add assert to before/after in sdk/test/utils
890016 Update tests to use unsupported application handling, rather than try/catch
Merge pull request #1079 from jsantell/update-places-tests-fennec

Fix Bug 890016 remove try/catch in tests for unsupported applications, r+=@ZER0
Merge pull request #1093 from jsantell/892126-add-assert-to-before-after

Fix Bug 892126 add assert to before/after in sdk/test/utils, r+=@erikvold
Merge branch 'master' into firefox25