Token/Urls now read from config.py, see example.config for syntax
Merge branch 'master' into dev