Merge branch 'milestone' of github.com:jnovack/phorkie into milestone