Merge branch 'release/0.0.6'
use older machina version
Merge pull request #1 from aprilb/master

use older machina version
version bump + changelog update
Merge branch 'release/0.0.7' into dev
Merge branch 'dev' of ssh://github.com/dominicbarnes/inlineedit into dev