Fix tokenstore config (ensure only available on 127.0.0.1).
Merge branch 'master' of github.com:airships/zephyr

Conflicts:
	cloudstore/src/cloudstore_sup.erl