Fix spec issue when running in weird time zones
Refactor out shift swaps to its own controller
Add partner and reserve status as active when importing