Squashed commit of the following:

commit 90650fb24305cffe37b1b5e8b56559ad47784c28
Author: Karissa McKelvey <krmckelv@gmail.com>
Date:   Fri Nov 22 04:13:17 2013 -0600

    pops the session token if we get a bad token response from google`

commit 4ba413774859a0e00e8ad1ed89ddb65d870ee3d5
Author: Karissa McKelvey <krmckelv@gmail.com>
Date:   Thu Nov 21 12:24:06 2013 -0600

    grunt needs dev config too

commit 86cdfcd8df4024fa8fb3f88beea4e8ec05b05c20
Author: Karissa McKelvey <krmckelv@gmail.com>
Date:   Thu Nov 21 12:22:12 2013 -0600

    add development to procfile

commit 5fead4b7f47c6c7022cd98b2d4d5fa49bfa122b0
Author: Karissa McKelvey <krmckelv@gmail.com>
Date:   Thu Nov 21 12:17:14 2013 -0600

    set up debug mode for heroku

commit bbb2a41313901c900f7cc5bbda0b9141dd8e6d5a
Author: Karissa McKelvey <krmckelv@indiana.edu>
Date:   Wed Nov 20 14:30:14 2013 -0600

    Update README.md

commit d7a2bd2fb591e79daefd5799d01aeb0f4412fc58
Author: Karissa McKelvey <krmckelv@gmail.com>
Date:   Tue Nov 19 19:49:32 2013 -0600

    add debug mode on production

commit ce0daa3590da06d8339a04f726c306e09fa5733f
Author: Karissa McKelvey <krmckelv@gmail.com>
Date:   Tue Nov 19 19:37:24 2013 -0600

    remove unneeded function

commit 6b174f40d7fa068ee5e7777c8d8cafa5a9324a34
Author: Karissa McKelvey <krmckelv@gmail.com>
Date:   Tue Nov 19 02:17:17 2013 -0600

    add google key and secret to sample config

commit a57a4d4bafddaa446ad2604784722b35b4ba7034
Merge: e8a2307 b5d4d99
Author: Karissa McKelvey <krmckelv@gmail.com>
Date:   Tue Nov 19 02:11:31 2013 -0600

    Merge branch 'reverting'

    Conflicts:
    	papertalk/__init__.py
    	papertalk/server.py
    	papertalk/views/main.py

commit b5d4d9953756636f56f27898bf1d2d768dae23b3
Author: Karissa McKelvey <krmckelv@gmail.com>
Date:   Tue Nov 19 02:08:48 2013 -0600

    Changes the way we load the config to make it more straightforawrd and allow use with google signin

commit 0a56ada3c60a4413ee69770f06ab70ccdb634165
Author: Karissa McKelvey <krmckelv@gmail.com>
Date:   Mon Nov 18 20:23:17 2013 -0600

    Mongo works with localhost now

commit e8a23072a7b1d315a05497b2e3200db7c654392e
Author: Karissa McKelvey <krmckelv@gmail.com>
Date:   Mon Nov 18 20:17:21 2013 -0600

    will play nice with local mongo

commit 46461c92a15f156bd7fa8521a40c1e267806f573
Author: Karissa McKelvey <krmckelv@gmail.com>
Date:   Mon Nov 18 10:21:25 2013 -0600

    trying to fix google thing, will initiate routes before request

commit eae85f9fd41a80449d66a9d91105f0ec423f0940
Author: Karissa McKelvey <krmckelv@gmail.com>
Date:   Mon Nov 18 01:19:59 2013 -0600

    if not logged in with google, doesn't show disqus.

commit 7ef73cadd488ee66326d7f4bd9c4cd7a4736db4d
Author: Karissa McKelvey <krmckelv@gmail.com>
Date:   Mon Nov 18 01:14:07 2013 -0600

    add disqus template

commit c4c2841eb5a2423234ed37c5d3e5afc4ab7f6f43
Author: Karissa McKelvey <krmckelv@gmail.com>
Date:   Mon Nov 18 01:13:58 2013 -0600

    add google signin img

commit 53eabaafdb4175a2ab06fc81503de5f5432f0409
Author: Karissa McKelvey <krmckelv@gmail.com>
Date:   Mon Nov 18 01:05:16 2013 -0600

    Improve form validation and security for reaction author; simplify the route.

commit fe1b78b3cc3f8e21c61ce72a964849bbe1f31f3e
Author: Karissa McKelvey <krmckelv@gmail.com>
Date:   Sat Nov 16 12:07:59 2013 -0600

    Abstract out disqus comments so they can be on the article and reaction

commit 4d79c981118b0af6e492288a5f41a0998f542e2f
Author: Karissa McKelvey <krmckelv@gmail.com>
Date:   Sat Nov 16 11:48:38 2013 -0600

    Automatically does SSL. Fixes #29

commit 614db42cc306db405c87015e2efd6e8e896b1284
Author: Karissa McKelvey <krmckelv@gmail.com>
Date:   Thu Nov 14 00:07:23 2013 -0600

    add signin

commit 7205f13440038d7371bd23187ff715df6eba8a93
Merge: bc2322f 2075ae2
Author: Karissa McKelvey <krmckelv@indiana.edu>
Date:   Wed Nov 13 22:05:24 2013 -0800

    Merge pull request #41 from karissamck/feature/sso

    Feature/sso

commit 2075ae2f37ffa75e5e17f936527bc0c8127fd1a0
Author: Karissa McKelvey <krmckelv@gmail.com>
Date:   Thu Nov 14 00:04:45 2013 -0600

    Do some fixes for the page layout

commit 7fc31d1c9749dc2fa9e555f442b9043f3ce09c3e
Author: Karissa McKelvey <krmckelv@gmail.com>
Date:   Wed Nov 13 23:19:45 2013 -0600

    it works! properly injects the current_user into the template and pulls it from the login_user

commit 717821fcf3879acb9489384d6faf41d45fa014a8
Author: Karissa McKelvey <krmckelv@gmail.com>
Date:   Wed Nov 13 10:42:46 2013 -0600

    Add username, email to database. Still isn't persisting across sessions, taking a look at why that is next

commit c4e9ba7d7b02054dfb494cd7b5e30cfda5d5720a
Author: Karissa McKelvey <krmckelv@gmail.com>
Date:   Tue Nov 12 14:44:22 2013 -0600

    login with google instead of twitter

commit bc2322f3bc026e1c77c742ba0b35e841eec2f2d8
Merge: e55264e 3c3545c
Author: Karissa McKelvey <krmckelv@indiana.edu>
Date:   Mon Nov 11 22:47:11 2013 -0800

    Merge pull request #38 from karissamck/bug/article-lookup

    fix lookup bug

commit 3c3545cee8a5fdaef64910b7f9d023233ad1feda
Author: Beau Cronin <beau.cronin@gmail.com>
Date:   Mon Nov 11 11:49:04 2013 -0800

    fix lookup bug

commit a5d44591b20e8d4d7cf81d327c5cfdb24a699127
Author: Karissa McKelvey <krmckelv@gmail.com>
Date:   Mon Nov 11 02:42:51 2013 -0500

    added twitter login hooks. encountering serious issues integrating sso, need to switch to google

commit 97962d4ea50ae534b740e791343a48eef13412ef
Author: Karissa McKelvey <krmckelv@gmail.com>
Date:   Sun Nov 10 17:38:31 2013 -0500

    small fixes i notcied

commit 5e54018f8133ee549cd3322883038e2ca07d3574
Author: Karissa McKelvey <krmckelv@gmail.com>
Date:   Sun Nov 10 17:38:22 2013 -0500

    small fixes and add disqus sso stuff to reaction_author

commit 72a425187c8044fd0c2070df5b9dc8a6eb1b2a9b
Author: Karissa McKelvey <krmckelv@gmail.com>
Date:   Sun Nov 10 17:37:43 2013 -0500

    add user and login functions with twitter oauth api