Fix bug when inputting bad data for sku and choosing retail
Fix Dashboard nav being active when in orders#edit
Fix adding imprintable line_item to job

Reorganize third party js library load order (fix js modal error)
Merge branch 'develop' of https://github.com/AnnArborTees/softwear-crm into develop-david
There are no actual issues with order
Added sunspot.yml to required thing for capistrano
Merge branch 'story-49-nigel' into develop
Added necessary include
Possibly better deploy tasks
Update deploy.rb
specify rails env as a parameter
Actually fixed solr capistrano commands
Fix payment public activity stupidity
Real quick fix dumb bug
Actually fix weird error. I'll go make tests now.
Tests for name/number iteration 1 are in
Cleaned up files that broke tests
Tests first
Works for the most part
And it's done\!