Changed equipment specs to fix problems resulting from changes to reservations factory
Changed sort_order validations to avoid having users guess an unclaimed sort-order value to make a new category
Merge pull request #411 from YaleSTC/402_fix_tests_broken_by_merge

402 fix tests broken by merge and Category sort_order validations