Updated API to work with new servers
Merge pull request #13 from ryanskidmore/master

Updated API to work with new servers (thanks @ryanskidmore)
Merge pull request #1 from tlack/master

Merge changes from upstream repository