finished the category promotion feature / wrestled with gemfile / fixed most feature specs
about to try to rebase master / this commit removed discount spec / modified the categories show