merge mike to my master Sun morning
merge master with mike work to chris2 sun morning
did a few more user controller tests
did lots of users controller tests. But on testing user destroy getting errors on undefined local variable or method ensure_not_referenced_by_line_item for Cart0x007f --and not sure how to resolve it