Merge branch 'master' of github.com:firebase/flashlight

Conflicts:
	lib/PathMonitor.js
Merge branch 'master' of github.com:firebase/flashlight