Merge branch 'develop'
Merge branch 'develop'
Injectables work + test injectable
Possibly implemented namespacing... Not sure
Documentation, whoa! + code cleanup
Real quick add option override on-inject
Update models with NonDeletable and clean up tests/functionality
Crankin' out specs for stuff that doesn't exist yet
Remove _factory suffix from factory files
populate specs with tests for unimplemented features, oh my!
Comment reminder before merging with develop
Merge branch 'develop' into develop-nigel-line-items

Conflicts:
	app/models/imprintable.rb
	app/models/style.rb
Accommodates for associations + view specs
Tags on the view specs
FIRST POST-SPEC CONTENT COMMIT
Merge branch 'develop' into develop-nigel-line-items
Fixed up some imprintable variant issues
Make unit price have appropriate precision and scale for currency
Add price method to line items
fixing things