Merge branch 'master' of https://github.com/lukebpotato/osmosis
Fix up a bunch of issues to do with pickling the instance, start writing tests