Squashed commit of the following:

commit 10b57ee000dec643f484645a7d50c74f52dd2bb8
Author: Jason Waters <jason@myheck.net>
Date:   Fri Jan 24 20:59:28 2014 -0700

    switched from django-social-auth to python-social-auth.  better handling of authentication errors and improved error pages.

commit 7cbc9f7f29e0b91d007d392b5cb589fc35bcc7be
Merge: e51c354 9eade63
Author: Jason Waters <jason@myheck.net>
Date:   Thu Jan 23 22:56:37 2014 -0700

    Merge branch 'refs/heads/teams' into python-social-auth

    Conflicts:
    	requirements.pip

commit e51c354e729c5ce51790e6fc86d4f793ddf3b32d
Author: Jason Waters <jason@myheck.net>
Date:   Sun Jan 12 21:18:59 2014 -0700

    back to oauth1 for map my fitness.  still not functional.

commit 6046dc6b44809e8b8ba716a790ded7f9caf3d15e
Merge: 8355789 bef1668
Author: Jason Waters <jason@myheck.net>
Date:   Sun Jan 12 19:51:53 2014 -0700

    Merge branch 'refs/heads/teams' into python-social-auth

    Conflicts:
    	fitcompetition/static/css/style.css
    	fitcompetition/templates/inclusions/player_email.html

commit 83557892fc45c23cccf7132864653b718c8aa6c4
Author: Jason Waters <jason@myheck.net>
Date:   Sun Dec 1 16:34:05 2013 -0700

    another attempt to get mapmyrun to work.  #lame

commit 0bf82c8d62e41ef1e2870f8d16343976cd45d107
Merge: bbe7185 c66ed93
Author: Jason Waters <jason@myheck.net>
Date:   Sun Dec 1 16:13:07 2013 -0700

    Merge branch 'refs/heads/teams' into python-social-auth

    Conflicts:
    	fitcompetition/static/css/style.css

commit bbe7185206b75b8559555b49f2a6a3def13de8cc
Author: Jason Waters <jason@myheck.net>
Date:   Fri Nov 22 21:57:36 2013 -0700

    mapmyfitness sucks

commit 8e3a7648a88646a14f01b49e1cc8fdbf544da6f9
Author: Jason Waters <jason@myheck.net>
Date:   Mon Nov 18 15:42:15 2013 -0700

    fixed migration conflict.  made social callout appear again

commit a0b1de0d8e358435c41c996396a2a7eac1ada471
Merge: 505c050 853c5ef
Author: Jason Waters <jason@myheck.net>
Date:   Mon Nov 18 15:25:38 2013 -0700

    Merge branch 'refs/heads/teams' into python-social-auth

    Conflicts:
    	fitcompetition/RunkeeperService.py
    	fitcompetition/static/css/style.css
    	fitcompetition/templates/challenge.html
    	fitcompetition/templates/login.html
    	fitcompetition/urls.py
    	requirements.pip
    	runkeeper.iml

commit 505c0504b917bccda2c009bcf2cd070b56a41fbe
Author: Jason Waters <jason@myheck.net>
Date:   Mon Nov 4 17:56:00 2013 -0700

    mapmyfitness not cooperating

commit ff920eb4a52b60638735356e8acbde517b324a79
Author: Jason Waters <jason@myheck.net>
Date:   Mon Nov 4 12:29:01 2013 -0700

    update to python-social-auth fixed the authentication for runkeeper

commit 90deeb7c12fb856841829611d905a8a766e520fa
Author: Jason Waters <jason@myheck.net>
Date:   Sun Nov 3 15:26:38 2013 -0700

    mapmyfitness stub

commit 05a0014983e972f3028d3e90e1438a22d3a4289b
Author: Jason Waters <jason@myheck.net>
Date:   Fri Nov 1 11:11:27 2013 -0600

    python-social-auth

commit b5f236203dfd89dab02ef2391f6f5c7dca845bf2
Author: Jason Waters <waters@attask.com>
Date:   Tue Oct 1 20:33:19 2013 -0600

    the beginnings of a mmf service

commit 4f8f1f03b73f0ef85aa7e1a34a806508963d22a5
Author: Jason Waters <waters@attask.com>
Date:   Mon Sep 30 22:26:13 2013 -0600

    show a modal dialog with both runkeeper and map my fitness as sign in options.

commit 8779d9bca9aa4d5e09dce8ae893558816ee48038
Author: Jason Waters <waters@attask.com>
Date:   Mon Sep 30 09:40:15 2013 -0600

    comments

commit ce11dfb759518315d99eeee102d7c66a4f2c6a85
Author: Jason Waters <waters@attask.com>
Date:   Sun Sep 29 22:51:17 2013 -0600

    support for MapMyFitness
runkeeper working again