Use firebase websocket api rather than json
Indentation consistency
Merge branch 'master' into gh-pages