fix .startup
fix .all (and make sure user gathering is working for other reasons)
++--
merge conflict fix
Merge pull request #93 from elliottcarlson/skynet

fix .startup