Merge branch 'im-column-dir' into vacation-stuff
Rearranged and added new accrual calculation code.
HTML reorganization for vacations.
New vacation changes and updated outdated unit tests.
Merge branch 'vacation-stuff' into staging