Merge stuff
Merge branch 'better-models' of github.com:CodePilotCo/CMS
Updated with my new username.
Merge branch 'master' of github.com:CodePilotCo/CMS
Merge branch 'better-models' of github.com:CodePilotCo/CMS
Merge branch 'better-models' of github.com:CodePilotCo/CMS
Merge branch 'better-models' of github.com:CodePilotCo/CMS
Merge branch 'better-models' of github.com:CodePilotCo/CMS
Merge branch 'better-models' of github.com:CodePilotCo/CMS
Merge branch 'better-models' of github.com:CodePilotCo/CMS
Merge branch 'better-models' of github.com:CodePilotCo/CMS
Merge branch 'better-models' of github.com:CodePilotCo/CMS
Added error handling for oauth errors and such. And the doctor in doctor who should not be abbreviated.
Merge pull request #123 from glenwayguy/master

Added error handling for oauth errors and such. And the doctor in doctor who should not be abbreviated. And it needs a space.