Timestamp bug fix

All timestamps have been fixed (revision history now in correct order)
Revert "Timestamp bug fix"

This reverts commit d7f814dccd95aacac3c68cd8e8a893a9c573b506.
Fixing files

Previous commit put the files in the wrong locations
Small fix
Merge branch 'master' into anandCleanup1