test for #856
refactor transition manager
merge conflict resolution
oops, messed up the merge
merge conflict resolution
fixes #856
tidy up
reordered if/else statements
Merge pull request #859 from ractivejs/gh-856

gh-856