added definitions to config file
merging w/ github.com version

Merge branch 'master' of github.com:mozilla-metrics/tableau-portal