Merge branch 'release-2014-10-17' of https://github.com/AnnArborTees/softwear-crm into story-213-david
Fixed
Story 213 Specs and fix
Merge branch 'release-2014-10-31' of https://github.com/AnnArborTees/softwear-crm into story-213-david
Story 213, adding variants to imprintables works properly now, plus better ui
Forgot to fix a spec I broke with refactors