cmaumet/ni-dm — pull request #2 by nicholsn (2013-11-18 19:42:59+00:00)
Title: Attempt to rebase changes from ni-:master

I tried to resolve some of the conflicts for merging with master. Might still need another round once these changes are incorporated.