bug 1017751 - activate before ready
Detraitify sdk/content/loader.
Bug 1111118 - Enable the e10s test add-on in the travis test suite
Bug 1111120 - Enable the simple-prefs test add-on in the travis test suite
Merge pull request #1756 from erikvold/1111120

Bug 1111120 - Enable the simple-prefs test add-on in the travis test suite a=me
Merge pull request #1524 from zombie/1017751-ready-ativate

Bug 1017751 - tab.onActivate can fire before the proper document exists r=erikvold
Merge pull request #1725 from Gozala/detraitify-content-loader

Bug 724632 - Detraitify sdk/content/loader r=erikvold
Revert "Merge pull request #1725 from Gozala/detraitify-content-loader"

This reverts commit b252a7be47cc9460f0218ad96170619e2b011278, reversing
changes made to 0f12cfa1c48f35c5829bcd66511693a79d567f4f.
Merge branch 'master' into 1111118

Conflicts:
	bin/node-scripts/test.addons.js
Merge pull request #1754 from erikvold/1111118

Bug 1111118 - Enable the e10s test add-on in the travis test suite a=me
Bug 970135 - Remove windows/loader
Merge pull request #1759 from erikvold/970135

Bug 970135 - Remove windows/loader r=@jsantell