Merge pull request #115 from instaclick/config_variables

Add Config Variables
Fix the tests on the latest master.
Merge pull request #117 from apenney/specsfix

Fix the tests on the latest master.