Merge pull request #509 from jgadbois/master

Look in base table before looking in slug table for slugged model

lib/friendly_id/history.rb

@@ -87,6 +87,7 @@ def exists_by_friendly_id?(id)
       private
 
       def first_by_friendly_id(id)
+        where(friendly_id_config.query_field => id).first ||
         select(quoted_table_name + '.*').joins(:slugs).where(slug_history_clause(id)).first
       end