Add C++ to languages
Merge branch 'master' into github-login
Consolidate find and create User omniauth methods