Fix holiday calculation; convert to expect rspec
Switch to Expect syntax
Remove current_user references for dashboard so we can override the @user