Merge pull request #10 from davy/master

Creating Timeline class, removing old code, adding more datums