trying again to commit stuff from last night
Merge pull request #3 from lrettig/master

pull final code changes from pennapps 2012s - again