Got rid of the MOCKDATA dependencies. We should be completely dependant on the API now.
Merge pull request #510 from Jedwondle/v1.2

Got rid of the MOCKDATA dependencies. We should be completely dependent on the API now.