Merge pull request #13 from DanGrayson/master

various changes
simplify a test in package NormalToricVarieties that runs out of memory
under Mac OS X.  There must be a memory leak somewhere, but we don't
know how to debug it.
disable a test for a while
fix a makefile