Update for 0.2.0

The messiest of commits
Merge branch 'master' of https://github.com/TPPI-Dev/TestPackPleaseIgnore