add videos
Merge remote-tracking branch 'upstream/master'
add updates to videos
fix likes and dislikes
fix tags
fix auth
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/controllers/application_controller.rb
	app/models/user.rb

	modified:   Gemfile
	modified:   Gemfile.lock
	modified:   app/controllers/admin/videos_controller.rb
	modified:   app/controllers/application_controller.rb
	new file:   app/controllers/omniauth_callbacks_controller.rb
	new file:   app/controllers/users_controller.rb
	new file:   app/models/identity.rb
	modified:   app/models/user.rb
	modified:   app/models/video.rb
	modified:   app/views/layouts/admin.html.erb
	new file:   app/views/users/finish_signup.html.erb
	modified:   config/initializers/devise.rb
	modified:   config/routes.rb
	new file:   db/migrate/20140701051851_add_slug_to_videos.rb
	new file:   db/migrate/20140701100143_create_identities.rb
	modified:   db/schema.rb
	modified:   db/seeds.rb
	new file:   test/fixtures/identities.yml
	new file:   test/models/identity_test.rb