converted all erb files to haml, cleaned extra files
  modified:   Gemfile
  modified:   Gemfile.lock
  deleted:    app/assets/fonts/fontawesome-webfont.eot
  deleted:    app/assets/fonts/fontawesome-webfont.svg
  deleted:    app/assets/fonts/fontawesome-webfont.ttf
  deleted:    app/assets/fonts/fontawesome-webfont.woff
  deleted:    app/assets/stylesheets/font-awesome.css.erb
  deleted:    app/controllers/twitter_accounts_controller.rb
  modified:   app/helpers/league_helper.rb
  deleted:    app/mailers/admin_mailer.rb
  deleted:    app/mailers/feedback_mailer.rb
  deleted:    app/mailers/people_mailer.rb
  modified:   app/models/tweet.rb
  deleted:    app/views/admin/_admin_sidebar.html.erb
  new file:   app/views/admin/_admin_sidebar.html.haml
  deleted:    app/views/admin/activity.html.erb
  new file:   app/views/admin/activity.html.haml
  deleted:    app/views/admin/clubs.html.erb
  new file:   app/views/admin/clubs.html.haml
  deleted:    app/views/admin/leagues.html.erb
  new file:   app/views/admin/leagues.html.haml
  deleted:    app/views/admin/people.html.erb
  new file:   app/views/admin/people.html.haml
  deleted:    app/views/admin/stats.html.erb
  new file:   app/views/admin/stats.html.haml
  deleted:    app/views/admin/users.html.erb
  new file:   app/views/admin/users.html.haml
  deleted:    app/views/admin_users/_form.html.erb
  new file:   app/views/admin_users/_form.html.haml
  deleted:    app/views/admin_users/edit.html.erb
  new file:   app/views/admin_users/edit.html.haml
  deleted:    app/views/admin_users/index.html.erb
  new file:   app/views/admin_users/index.html.haml
  deleted:    app/views/admin_users/new.html.erb
  new file:   app/views/admin_users/new.html.haml
  deleted:    app/views/admin_users/show.html.erb
  new file:   app/views/admin_users/show.html.haml
  deleted:    app/views/clubs/_club_header.html.erb
  new file:   app/views/clubs/_club_header.html.haml
  deleted:    app/views/clubs/_club_people.html.erb
  new file:   app/views/clubs/_club_people.html.haml
  deleted:    app/views/clubs/_form.html.erb
  new file:   app/views/clubs/_form.html.haml
  deleted:    app/views/clubs/edit.html.erb
  new file:   app/views/clubs/edit.html.haml
  deleted:    app/views/clubs/new.html.erb
  new file:   app/views/clubs/new.html.haml
  deleted:    app/views/clubs/show.html.erb
  new file:   app/views/clubs/show.html.haml
  deleted:    app/views/clubs/show.js.erb
  new file:   app/views/clubs/show.js.haml
  deleted:    app/views/devise/_links.erb
  new file:   app/views/devise/_links.haml
  deleted:    app/views/devise/confirmations/new.html.erb
  new file:   app/views/devise/confirmations/new.html.haml
  deleted:    app/views/devise/mailer/confirmation_instructions.html.erb
  new file:   app/views/devise/mailer/confirmation_instructions.html.haml
  deleted:    app/views/devise/mailer/reset_password_instructions.html.erb
  new file:   app/views/devise/mailer/reset_password_instructions.html.haml
  deleted:    app/views/devise/mailer/unlock_instructions.html.erb
  new file:   app/views/devise/mailer/unlock_instructions.html.haml
  deleted:    app/views/devise/passwords/edit.html.erb
  new file:   app/views/devise/passwords/edit.html.haml
  deleted:    app/views/devise/passwords/new.html.erb
  new file:   app/views/devise/passwords/new.html.haml
  deleted:    app/views/devise/registrations/edit.html.erb
  new file:   app/views/devise/registrations/edit.html.haml
  deleted:    app/views/devise/registrations/new.html.erb
  new file:   app/views/devise/registrations/new.html.haml
  deleted:    app/views/devise/sessions/new.html.erb
  new file:   app/views/devise/sessions/new.html.haml
  deleted:    app/views/devise/unlocks/new.html.erb
  new file:   app/views/devise/unlocks/new.html.haml
  deleted:    app/views/layouts/_footer.html.erb
  new file:   app/views/layouts/_footer.html.haml
  renamed:    app/views/layouts/_google_analytics.html.erb -> app/views/layouts/_google_analytics.html.haml
  deleted:    app/views/layouts/_header.html.erb
  new file:   app/views/layouts/_header.html.haml
  deleted:    app/views/layouts/_subhead.html.erb
  new file:   app/views/layouts/_subhead.html.haml
  deleted:    app/views/layouts/admin_layout.html.erb
  new file:   app/views/layouts/admin_layout.html.haml
  deleted:    app/views/layouts/application.html.erb
  new file:   app/views/layouts/application.html.haml
  deleted:    app/views/leagues/_form.html.erb
  new file:   app/views/leagues/_form.html.haml
  deleted:    app/views/leagues/edit.html.erb
  new file:   app/views/leagues/edit.html.haml
  deleted:    app/views/leagues/new.html.erb
  new file:   app/views/leagues/new.html.haml
  deleted:    app/views/leagues/show.html.erb
  new file:   app/views/leagues/show.html.haml
  deleted:    app/views/leagues/show.js.erb
  new file:   app/views/leagues/show.js.haml
  deleted:    app/views/nations/index.html.erb
  new file:   app/views/nations/index.html.haml
  deleted:    app/views/nations/show.html.erb
  new file:   app/views/nations/show.html.haml
  deleted:    app/views/nations/show.js.erb
  new file:   app/views/nations/show.js.haml
  deleted:    app/views/pages/home.html.erb
  new file:   app/views/pages/home.html.haml
  deleted:    app/views/pages/info.html.erb
  new file:   app/views/pages/info.html.haml
  deleted:    app/views/people/_follow.html.erb
  new file:   app/views/people/_follow.html.haml
  deleted:    app/views/people/_follow_form.html.erb
  new file:   app/views/people/_follow_form.html.haml
  deleted:    app/views/people/_form.html.erb
  new file:   app/views/people/_form.html.haml
  deleted:    app/views/people/_person_header.html.erb
  new file:   app/views/people/_person_header.html.haml
  deleted:    app/views/people/_related_people.html.erb
  new file:   app/views/people/_related_people.html.haml
  deleted:    app/views/people/_twitter_profile_stats.html.erb
  new file:   app/views/people/_twitter_profile_stats.html.haml
  deleted:    app/views/people/_unfollow.html.erb
  new file:   app/views/people/_unfollow.html.haml
  deleted:    app/views/people/edit.html.erb
  new file:   app/views/people/edit.html.haml
  deleted:    app/views/people/index.html.erb
  new file:   app/views/people/index.html.haml
  deleted:    app/views/people/new.html.erb
  new file:   app/views/people/new.html.haml
  deleted:    app/views/people/show.html.erb
  new file:   app/views/people/show.html.haml
  deleted:    app/views/people/show.js.erb
  new file:   app/views/people/show.js.haml
  deleted:    app/views/shared/_follow.html.erb
  new file:   app/views/shared/_follow.html.haml
  deleted:    app/views/shared/_tweet.html.erb
  new file:   app/views/shared/_tweet.html.haml
  deleted:    app/views/shared/_twitter_modal.html.erb
  new file:   app/views/shared/_twitter_modal.html.haml
  deleted:    app/views/shared/_unfollow.html.erb
  new file:   app/views/shared/_unfollow.html.haml
  deleted:    app/views/tweets/club_stream.js.erb
  new file:   app/views/tweets/club_stream.js.haml
  deleted:    app/views/tweets/league_stream.js.erb
  new file:   app/views/tweets/league_stream.js.haml
  deleted:    app/views/tweets/nation_tourney_stream.js.erb
  new file:   app/views/tweets/nation_tourney_stream.js.haml
  deleted:    app/views/tweets/person_stream.js.erb
  new file:   app/views/tweets/person_stream.js.haml
  deleted:    app/views/tweets/tourney_stream.js.erb
  new file:   app/views/tweets/tourney_stream.js.haml
  deleted:    lib/assets/bundesliga_players.csv
  deleted:    lib/sandbox/_tabs.html.erb
  deleted:    lib/sandbox/club_directory.html.erb
  new file:   lib/templates/erb/scaffold/_form.html.haml
  new file:   lib/templates/haml
  deleted:    lib/twitter/client.rb
  modified:   test/unit/person_test.rb
Merge branch 'master' into mongoid_conversion

Conflicts:
	Gemfile.lock
	app/models/tweet.rb
WIP - removed active record - models all mongoid now
  new file:   Gemfile.lock
  modified:   app/controllers/pages_controller.rb
  modified:   app/models/club.rb
  renamed:    app/models/tweet.rb -> app/models/deprecated/tweet.rb
  modified:   app/models/person.rb
  modified:   app/models/stat.rb
  renamed:    app/models/tweet_mongo.rb -> app/models/tweet.rb
  modified:   app/models/twitter_account.rb
  modified:   config/application.rb
  deleted:    config/database.yml
  modified:   config/environments/development.rb
  modified:   config/environments/test.rb
  new file:   db/mongoid.yml
  modified:   db/seeds.rb