Merge pull request #2 from dbernstein/master

improves code style of test.
Refactors generic_file_spec.rb
Merge branch 'release/0.2.0'

Conflicts:
	spec/models/generic_file_spec.rb
fixes readme.
Merge branch 'develop'