Update timestamp parsing to follow newer org-mode ([2014-01-06] is allowed as well as [2014-01-06 ])
Remove unnecessary tokens