Added ability to save twitter oauth token and secret for users who do not sign in with twitter
Merging with origin master

Merge branch 'master' of https://github.com/hamchapman/catchr