updated files with omitted history
Merge branch 'test_disabled_user' of /home/git/repositories/AeroNotix/timetracker
Fix up indentation on failing test.