todos for timber
Merge branch 'master' of github.com:jarednova/timber