Added time units
Grouped all derived units into SI
Merge pull request #6 from jcristovao/master

Added time units as discussed on #4 and #6