various printing back to working
various printing works
Merge branch 'cleanup' of github.com:jasonknight/salor-retail into cleanup

Conflicts:
	salor-retail/app/models/order_item.rb