Include waffle switches and FxA stuff in commonplace index.html (bug 1093584)
Merge pull request #2705 from diox/return-waffles-with-index.html

Include waffle switches and FxA stuff in commonplace index.html (bug 1093584)