Merge pull request #31 from zbtirrell/master

removing failed attempt at caching
clear up a few more notices.  Minor whitespace changes