Merge pull request #2 from cbcunc/master

Second volley back from RENCI.
Minor changes.
Merge pull request #2 from bjlittle/master

 Merge pull request #2 from cbcunc/master