Refactors generic_file_spec.rb
Merge branch 'release/0.2.0'

Conflicts:
	spec/models/generic_file_spec.rb
fixes readme.
Merge branch 'develop'
Merge pull request #6 from dbernstein/master

generic_file_spec.rb refactorings