Merge pull request #1 from gogamoga/workflow

base-node and dev-node are the defaults now
restoring workflow branch is easy
Merge pull request #1 from gogamatic/workflow

edit only on fork