Merge pull request #3 from techjeffharris/master

tying up loose ends, bugfixing installation
Merge pull request #1 from adminion/master

Merge pull request #3 from techjeffharris/master