Merge pull request #37 from vossgang/matt-copy

fixed timeline and flow layout
huh?
Merge remote-tracking branch 'upstream/master'
2 = withSequence
Merge pull request #38 from seanmcneil/master

withSequence FTW
Merge remote-tracking branch 'origin/master'
log