Updates to dragonfly model: working version on Mira

git-svn-id: https://subversion.cs.rpi.edu/svn/rossnet/trunk@685 2481c9be-fdbf-de11-a427-00b0d041e3d9
Merge remote-tracking branch 'upstream'