Update all the things + updated docker setup
Merge pull request #9 from Keats/update

Update all the things + updated docker setup