Added the ability to say 'minutes' instead of 'm', with all the time modifiers
Fixed merge conflict