Start working on prepares and cleans.
Improvements.
Merge branches 'pholey-rewrite' and 'rewrite' of github.com:armet/python-armet into pholey-rewrite