Unmerging.

Stupid git errors. I need to work more slowly.
Merge branch 'master' of https://github.com/robison/nsnitro