Refactor to be a bit less janky
Add docker
Bump version for travis