Fixed Google OAuth to not expire after one hour. Eventually may need to update Google OAuth to the new Google+ sign in
Merge branch 'dm-googleOAuth' with Andrew's branch.