Merge pull request #197 from rajthilakmca/0.5

fixed google oauth
upgraded nokogiri to 1.6.5
Merge remote-tracking branch 'origin/0.5' into 0.5
Merge pull request #198 from indykish/0.5

0.5
issues fixed
Merge remote-tracking branch 'origin/0.5' into 0.5
Fixed issues