Added easy upstream merging
Oops
Merge remote branch 'upstream/master'
Renamed config.js to config.json so mocha doesnt freak out
so api keys are not committed
forgot to update the test file
Reorganized Tests
Organized Tests
Merge pull request #9 from TopTierTech/master

Organized Testing