[3037] Timeline
buildout support
style fixes
Merge pull request #3 from matlobocki/bug_3037

[3037] Timeline