eliminate confusion on shift times; closes #991
Merge pull request #992 from affektive/am_pm

eliminate confusion on shift times; closes #991