Merged bob's edits with gunnar's edits

The refactor of nimsutil -> nimsdata diverged a bit when bob started to
back-port it to the master branch. This commit should bring them back in
harmony. Hopefully we can move forward with a common codebase.