Renamed matchers "generate" and "delete" to "generate_file" and "delete_file" since these conflict with FactoryGirl's "generate" method and the "delete" method used in controller specs to perform requests with the delete HTTP verb.
Merge remote-tracking branch 'vito/master'

Conflicts:
	spec/generators/migration_spec.rb