Split tasks into different logical sections

Also reorder, so that users are added *before* password-based login is
turned off...
Merge pull request #7 from sealevelresearch/split-out-tasks

Split tasks into different logical sections