Finish refactoring name/number functionality

About to refactor specs
Finish refactoring spec
Merge branch 'story-189-david' of https://github.com/AnnArborTees/softwear-crm into release-2014-10-17