Added waffle flags to consumer-info api (bug 1021296)

Conflicts:
	mkt/fireplace/views.py
add API endpoint for FxA login (bug 1021295)
Merge pull request #2258 from washort/fxa-api

add API endpoint for FxA login (bug 1021295)