Changes to get NDDesiderata to compile.
Fixed conflicts.
D'oh.
...wtf...
Merge branch 'develop' of github.com:ndouglas/NDDesiderata into develop
Bump.
Fixed merge conflicts.