included test code and possibly other minor changes
Merge branch 'master' of github.com:Macaulay2/Workshop-2014-Berkeley