big refactor
added test coverage. more refactoring
Merge branch 'master' of github.com:robertodling/calc