removed seed file, added rake task
deleted joiner table timestamp
resolved flight.rb conflict