move config
Merge pull request #60 from calblueprint/varun/fix-tests

move config
Merge branch 'master' into will/amazon