initial checkin
Merge https://github.com/nikmartin/makemachine