Cleaning up the warehouses, making most methods const, avoiding vector copies
closes #3358, #3368
Merge pull request #3377 from permcody/warehouse_cleanup

Cleaning up the warehouses
Merge commit '24f6b712e474e73849d278296c661c09f7359776'