Merge remote-tracking branch 'upstream/master' into jp822
Merge remote-tracking branch 'upstream/master' into jp822
Merge remote-tracking branch 'upstream/master' into jp822
Merge remote-tracking branch 'upstream/master' into jp822
Merge remote-tracking branch 'upstream/master' into jp822
Merge remote-tracking branch 'upstream/master' into jp822
Hacked the API so that login works now muahahahahahaha. *Cough*
Merge pull request #910 from jaypoulz/jp822

Major hackzor.