Computer flow
=============

Cherry-pick to master common changes.

Rebase onto machine branches common changes

ToDo
====

- add templating for things like home and user names