fixing duration regex match

Fixing moment duration to include hours timestamp location and shifting other matches accordingly
Another update to make sure it gets the last line
Merge branch 'bryankreitlow-master'
fixed tests