cleanup
rewrite as thunks
code cleanup
travis: modern node
ignore: modern
Merge branch 'refactor/thunks'