Merge pull request #217 from jwendl/master

Reverting code changes involved with filtering out test accounts.
Merge pull request #218 from jwendl/master

Fixing issue #207
Merge pull request #55 from Magenic/master

Merging to my local branch