Port todos bundle from v1, some cleanup
Merge pull request #13 from bem/todos@v2

Port todos bundle from v1, some cleanup