Merge pull request #1 from cbcunc/master

First volley back from RENCI.
Merge pull request #1 from bjlittle/master

Merge pull request #1 from cbcunc/master