rejigging some classes
requiring calculator
Merge branch 'request' of github.com:lachlanp/syllable_counter into request