Merge pull request #41 from brianhlin/master

Bootstrap settings and environment fixes.