Create branch issue-13.
Move the dev/test tokens out of environment variables.
Merge pull request #23 from ggrillone/issue-13

Issue 13