fixes to make installs work
Merge pull request #1 from michaelrice/master

fixes to make installs work