Began refactoring GenreCalculator spec
Minor wording changes to spec descriptions
Merge branch 'master' into genre_calc_spec_refactor
Merge pull request #128 from fence-lizards-2014/genre_calc_spec_refactor

Genre calc spec refactored