Fixing some bugs that were leftover from build script setup
Merge pull request #11 from ngrid/1.0.RC2

1.0.rc2 -- Misceleneous bug fixes.