Basic omniauth functionality
Add oAuth
Upgrade to activerecord 4, populate all routes
Add seed for comments, user_splashes
fix merge conflict in index erb
Fix merge conflict Merge branch 'francis_routes' into development
fix merge conflict in index erb