Merge pull request #2 from bjlittle/master

 Merge pull request #2 from cbcunc/master
Minor abstract and format changes from review by Brian Blanton.
Merge pull request #3 from cbcunc/master

Third and final volley from RENCI.