Downgraded from Google Play Services 13, tidied up code
Merge pull request #16 from whyohwhyamihere/master

Downgraded from Google Play Services 13, tidied up code